stack
/
drone
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

ci: jsonnet-drone@0.1.0

This commit is contained in:
Giles Bradshaw 2020-08-28 21:51:50 +01:00
parent f4e8bec884
commit 9a7c02607c
12 changed files with 101 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone/build.sh
View File

@ -1 +1 @@
docker build drone-starlark -t ${LOCAL_DOCKER_REGISTRY}drone-starlark echo 'nothing to build'

6
.drone/drone-home.jsonnet
View File

@ -10,11 +10,13 @@ local register = import 'node_modules/@sigyl/jsonnet-drone/register.libsonnet';
'drone', 'drone',
'/stack/', '/stack/',
[ [
'LOCAL_DOCKER_REGISTRY', 'REGISTRY_DOMAIN',
'REGISTRY_PORT',
'REGISTRY_PASSWORD', 'REGISTRY_PASSWORD',
], ],
publicSecrets, publicSecrets,
secretSecrets secretSecrets,
[],
) { ) {
trigger +: { trigger +: {
event +: [ event +: [

137
.drone/drone-home.yml
View File

@ -26,7 +26,7 @@ platform:
steps: steps:
- name: print env - name: print env
image: appleboy/drone-ssh:1.6.2 image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
settings: settings:
envs: envs:
- drone_tag - drone_tag
@ -34,39 +34,42 @@ steps:
- drone_build_number - drone_build_number
- drone_repo_name - drone_repo_name
- drone_repo_namespace - drone_repo_namespace
- local_docker_registry - registry_domain
- registry_port
- registry_password - registry_password
- drone_domain - domain
- drone_gitea_client_id - drone_gitea_client_id
- drone_gitea_server - drone_gitea_server
- drone_server_host - drone_server_host
- drone_convert_secret - ssh_host
- ssh_user
- ssh_port
- drone_gitea_client_secret - drone_gitea_client_secret
- drone_rpc_secret - drone_rpc_secret
host: - ssh_key
from_secret: ssh-host host: ${SSH_HOST}
key: key: ${SSH_KEY}
from_secret: ssh-key passphrase: ${SSH_PASSPHRASE}
port: port: ${SSH_PORT}
from_secret: ssh-port
script: script:
- rm -f env-drone - rm -f env-drone
- "echo \"export LOCAL_DOCKER_REGISTRY='$${LOCAL_DOCKER_REGISTRY}'\" >> env-drone # \"local-docker-registry\"" - "echo \"export REGISTRY_DOMAIN='$${REGISTRY_DOMAIN}'\" >> env-drone # \"registry-domain\""
- "echo \"export REGISTRY_PORT='$${REGISTRY_PORT}'\" >> env-drone # \"registry-port\""
- "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-drone # \"registry-password\"" - "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-drone # \"registry-password\""
- "echo \"export DRONE_DOMAIN='$${DRONE_DOMAIN}'\" >> env-drone # \"drone-domain\"" - "echo \"export DOMAIN='$${DOMAIN}'\" >> env-drone # \"domain\""
- "echo \"export DRONE_GITEA_CLIENT_ID='$${DRONE_GITEA_CLIENT_ID}'\" >> env-drone # \"drone-gitea-client-id\"" - "echo \"export DRONE_GITEA_CLIENT_ID='$${DRONE_GITEA_CLIENT_ID}'\" >> env-drone # \"drone-gitea-client-id\""
- "echo \"export DRONE_GITEA_SERVER='$${DRONE_GITEA_SERVER}'\" >> env-drone # \"drone-gitea-server\"" - "echo \"export DRONE_GITEA_SERVER='$${DRONE_GITEA_SERVER}'\" >> env-drone # \"drone-gitea-server\""
- "echo \"export DRONE_SERVER_HOST='$${DRONE_SERVER_HOST}'\" >> env-drone # \"drone-server-host\"" - "echo \"export DRONE_SERVER_HOST='$${DRONE_SERVER_HOST}'\" >> env-drone # \"drone-server-host\""
- "echo \"export DRONE_CONVERT_SECRET='$${DRONE_CONVERT_SECRET}'\" >> env-drone # \"drone-convert-secret\"" - "echo \"export SSH_HOST='$${SSH_HOST}'\" >> env-drone # \"ssh-host\""
- "echo \"export SSH_USER='$${SSH_USER}'\" >> env-drone # \"ssh-user\""
- "echo \"export SSH_PORT='$${SSH_PORT}'\" >> env-drone # \"ssh-port\""
- "echo \"export DRONE_GITEA_CLIENT_SECRET='$${DRONE_GITEA_CLIENT_SECRET}'\" >> env-drone # \"drone-gitea-client-secret\"" - "echo \"export DRONE_GITEA_CLIENT_SECRET='$${DRONE_GITEA_CLIENT_SECRET}'\" >> env-drone # \"drone-gitea-client-secret\""
- "echo \"export DRONE_RPC_SECRET='$${DRONE_RPC_SECRET}'\" >> env-drone # \"drone-rpc-secret\"" - "echo \"export DRONE_RPC_SECRET='$${DRONE_RPC_SECRET}'\" >> env-drone # \"drone-rpc-secret\""
username: - "echo \"export SSH_KEY='$${SSH_KEY}'\" >> env-drone # \"ssh-key\""
from_secret: ssh-user username: ${SSH_USER}
environment: environment:
DRONE_CONVERT_SECRET: DOMAIN:
from_secret: drone-convert-secret from_secret: domain
DRONE_DOMAIN:
from_secret: drone-domain
DRONE_GITEA_CLIENT_ID: DRONE_GITEA_CLIENT_ID:
from_secret: drone-gitea-client-id from_secret: drone-gitea-client-id
DRONE_GITEA_CLIENT_SECRET: DRONE_GITEA_CLIENT_SECRET:
@ -77,34 +80,41 @@ steps:
from_secret: drone-rpc-secret from_secret: drone-rpc-secret
DRONE_SERVER_HOST: DRONE_SERVER_HOST:
from_secret: drone-server-host from_secret: drone-server-host
LOCAL_DOCKER_REGISTRY: REGISTRY_DOMAIN:
from_secret: local-docker-registry from_secret: registry-domain
REGISTRY_PASSWORD: REGISTRY_PASSWORD:
from_secret: registry-password from_secret: registry-password
REGISTRY_PORT:
from_secret: registry-port
SSH_HOST:
from_secret: ssh-host
SSH_KEY:
from_secret: ssh-key
SSH_PORT:
from_secret: ssh-port
SSH_USER:
from_secret: ssh-user
- name: scp - name: scp
image: appleboy/drone-scp:1.6.2 image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
settings: settings:
command_timeout: 2m command_timeout: 2m
host: host: ${SSH_HOST}
from_secret: ssh-host key: ${SSH_KEY}
key: passphrase: ${SSH_PASSPHRASE}
from_secret: ssh-key port: ${SSH_PORT}
port:
from_secret: ssh-port
source: source:
- . - .
target: /stack/drone target: /stack/drone
username: username: ${SSH_USER}
from_secret: ssh-user
- name: wait - name: wait
image: alpine image: alpine:3.12.0@sha256:90baa0922fe90624b05cb5766fa5da4e337921656c2f8e2b13bd3c052a0baac1
commands: commands:
- sleep 15 - sleep 15
- name: "dockerbuild:" - name: "dockerbuild:"
image: docker:dind image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
commands: commands:
- set -e - set -e
- sh .drone/login.sh - sh .drone/login.sh
@ -112,16 +122,18 @@ steps:
- sh .drone/push.sh - sh .drone/push.sh
- sh .drone/logout.sh - sh .drone/logout.sh
environment: environment:
LOCAL_DOCKER_REGISTRY: REGISTRY_DOMAIN:
from_secret: local-docker-registry from_secret: registry-domain
REGISTRY_PASSWORD: REGISTRY_PASSWORD:
from_secret: registry-password from_secret: registry-password
REGISTRY_PORT:
from_secret: registry-port
volumes: volumes:
- name: dockersock - name: dockersock
path: /var/run path: /var/run
- name: deploy - name: deploy
image: appleboy/drone-ssh:1.6.2 image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
settings: settings:
envs: envs:
- drone_tag - drone_tag
@ -129,43 +141,46 @@ steps:
- drone_build_number - drone_build_number
- drone_repo_name - drone_repo_name
- drone_repo_namespace - drone_repo_namespace
- drone_domain - domain
- drone_gitea_client_id - drone_gitea_client_id
- drone_gitea_server - drone_gitea_server
- drone_server_host - drone_server_host
- drone_convert_secret - ssh_host
- ssh_user
- ssh_port
- drone_gitea_client_secret - drone_gitea_client_secret
- drone_rpc_secret - drone_rpc_secret
- local_docker_registry - ssh_key
- registry_domain
- registry_port
- registry_password - registry_password
host: host: ${SSH_HOST}
from_secret: ssh-host key: ${SSH_KEY}
key: passphrase: ${SSH_PASSPHRASE}
from_secret: ssh-key port: ${SSH_PORT}
port:
from_secret: ssh-port
script: script:
- export DRONE_CONVERT_SECRET=$${DRONE_CONVERT_SECRET}
- export DRONE_GITEA_CLIENT_SECRET=$${DRONE_GITEA_CLIENT_SECRET} - export DRONE_GITEA_CLIENT_SECRET=$${DRONE_GITEA_CLIENT_SECRET}
- export DRONE_RPC_SECRET=$${DRONE_RPC_SECRET} - export DRONE_RPC_SECRET=$${DRONE_RPC_SECRET}
- export DRONE_DOMAIN=$${DRONE_DOMAIN} - export SSH_KEY=$${SSH_KEY}
- export DOMAIN=$${DOMAIN}
- export DRONE_GITEA_CLIENT_ID=$${DRONE_GITEA_CLIENT_ID} - export DRONE_GITEA_CLIENT_ID=$${DRONE_GITEA_CLIENT_ID}
- export DRONE_GITEA_SERVER=$${DRONE_GITEA_SERVER} - export DRONE_GITEA_SERVER=$${DRONE_GITEA_SERVER}
- export DRONE_SERVER_HOST=$${DRONE_SERVER_HOST} - export DRONE_SERVER_HOST=$${DRONE_SERVER_HOST}
- export LOCAL_DOCKER_REGISTRY=$${LOCAL_DOCKER_REGISTRY} - export SSH_HOST=$${SSH_HOST}
- export SSH_USER=$${SSH_USER}
- export SSH_PORT=$${SSH_PORT}
- export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
- export REGISTRY_PORT=$${REGISTRY_PORT}
- export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD} - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
- set -e - set -e
- cd /stack/drone - cd /stack/drone
- sh .drone/login.sh - sh .drone/login.sh
- sh .drone/pull.sh - sh .drone/pull.sh
- sh .drone/deploy.sh - sh .drone/deploy.sh
username: username: ${SSH_USER}
from_secret: ssh-user
environment: environment:
DRONE_CONVERT_SECRET: DOMAIN:
from_secret: drone-convert-secret from_secret: domain
DRONE_DOMAIN:
from_secret: drone-domain
DRONE_GITEA_CLIENT_ID: DRONE_GITEA_CLIENT_ID:
from_secret: drone-gitea-client-id from_secret: drone-gitea-client-id
DRONE_GITEA_CLIENT_SECRET: DRONE_GITEA_CLIENT_SECRET:
@ -176,14 +191,24 @@ steps:
from_secret: drone-rpc-secret from_secret: drone-rpc-secret
DRONE_SERVER_HOST: DRONE_SERVER_HOST:
from_secret: drone-server-host from_secret: drone-server-host
LOCAL_DOCKER_REGISTRY: REGISTRY_DOMAIN:
from_secret: local-docker-registry from_secret: registry-domain
REGISTRY_PASSWORD: REGISTRY_PASSWORD:
from_secret: registry-password from_secret: registry-password
REGISTRY_PORT:
from_secret: registry-port
SSH_HOST:
from_secret: ssh-host
SSH_KEY:
from_secret: ssh-key
SSH_PORT:
from_secret: ssh-port
SSH_USER:
from_secret: ssh-user
services: services:
- name: docker - name: docker
image: docker:dind image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
privileged: true privileged: true
volumes: volumes:
- name: dockersock - name: dockersock

5
.drone/lib/public-secrets.libsonnet
View File

@ -1,6 +1,9 @@
[ [
'drone-domain', 'domain',
'drone-gitea-client-id', 'drone-gitea-client-id',
'drone-gitea-server', 'drone-gitea-server',
'drone-server-host', 'drone-server-host',
'ssh-host',
'ssh-user',
'ssh-port'
] ]

2
.drone/lib/secret-secrets.libsonnet
View File

@ -1,5 +1,5 @@
[ [
'drone-convert-secret',
'drone-gitea-client-secret', 'drone-gitea-client-secret',
'drone-rpc-secret', 'drone-rpc-secret',
'ssh-key'
] ]

2
.drone/login.sh
View File

@ -1 +1 @@
docker login ${LOCAL_DOCKER_REGISTRY} --username client --password "${REGISTRY_PASSWORD}" docker login ${REGISTRY_DOMAIN}:${REGISTRY_PORT} --username client --password "${REGISTRY_PASSWORD}"

2
.drone/logout.sh
View File

@ -1 +1 @@
docker logout ${LOCAL_DOCKER_REGISTRY} docker logout ${REGISTRY_DOMAIN}:${REGISTRY_PORT}

2
.drone/package.json
View File

@ -4,6 +4,6 @@
"build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream" "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream"
}, },
"dependencies": { "dependencies": {
"@sigyl/jsonnet-drone": "^0.0.8" "@sigyl/jsonnet-drone": "^0.1.0"
} }
} }

2
.drone/pull.sh
View File

@ -1 +1 @@
docker build drone-starlark -t ${LOCAL_DOCKER_REGISTRY}drone-starlark echo 'nothing to pull'

2
.drone/push.sh
View File

@ -1 +1 @@
docker push ${LOCAL_DOCKER_REGISTRY}drone-starlark echo 'nothing to push'

8
.drone/yarn.lock
View File

@ -12,10 +12,10 @@
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff" resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff"
integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw== integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw==
"@sigyl/jsonnet-drone@^0.0.8": "@sigyl/jsonnet-drone@^0.1.0":
version "0.0.8" version "0.1.0"
resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.0.8.tgz#f928e6784bccf1abb82afed3cab6e435c62d2e93" resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.1.0.tgz#feda1797e8e9ef799cad72e65f7163ca26a9e3a5"
integrity sha512-BuFVawb7z3aUYqHCBqykgALjF07crnN2H7+WLo8crH3vT7FPMLbYdoTv7N98P8OhZBKv6KvBQep6uZK3Reho5g== integrity sha512-QY/ngucxFOtLfL8Mt0f2bxN4fQDUOGOFtaRpSH2cNyg84xADkzehT0ORZtbLitr+AwhyF5KN/zAGvzkyNAoqPw==
dependencies: dependencies:
"@sigyl/jsonnet-compose" "^0.0.2" "@sigyl/jsonnet-compose" "^0.0.2"
"@sigyl/jsonnet-drone-environment" "0.0.5" "@sigyl/jsonnet-drone-environment" "0.0.5"

20
docker-compose.yml
View File

@ -26,8 +26,6 @@ services:
- DRONE_USER_CREATE=username:giles,admin:true - DRONE_USER_CREATE=username:giles,admin:true
- DRONE_AGENTS_ENABLED=true - DRONE_AGENTS_ENABLED=true
- DRONE_JSONNET_ENABLED=true - DRONE_JSONNET_ENABLED=true
- DRONE_CONVERT_PLUGIN_ENDPOINT=http://drone-starlark:3000
- DRONE_CONVERT_PLUGIN_SECRET=${DRONE_CONVERT_SECRET}
networks: networks:
- appnet - appnet
- externalnet - externalnet
@ -48,23 +46,7 @@ services:
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET} - DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
- DRONE_RUNNER_CAPACITY=8 - DRONE_RUNNER_CAPACITY=8
- DRONE_RUNNER_NAME="docker-runner" - DRONE_RUNNER_NAME="docker-runner"
networks: - DRONE_RUNNER_ENVIRON=DOMAIN:$DOMAIN,REGISTRY_DOMAIN:$REGISTRY_DOMAIN,REGISTRY_PORT:$REGISTRY_PORT,REGISTRY_PASSWORD:$REGISTRY_PASSWORD,SSH_HOST:$SSH_HOST,SSH_PORT:$SSH_PORT,SSH_USER:$SSH_USER,SSH_KEY:$SSH_KEY
- appnet
drone-starlark:
# drone starlark server converts starlark to yaml
deploy:
placement:
constraints: [node.labels.com.sigyl.git-stack == yes]
replicas: 1
restart_policy:
condition: any
image: ${LOCAL_DOCKER_REGISTRY}drone-starlark
environment:
- DRONE_DEBUG=true
- DRONE_SECRET=${DRONE_CONVERT_SECRET}
- DRONE_STARLARK_REPO_PATHS=this:/repos
- SIGYL_STACK_NAME=$SIGYL_STACK_NAME
- SIGYL_STACK_ROOT=$SIGYL_STACK_ROOT
networks: networks:
- appnet - appnet
volumes: volumes: