From 706d4e3e2bb8c7c10047b9b7433fdd4e83ffe591 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Thu, 24 Sep 2020 16:49:52 +0100 Subject: [PATCH] feat: registry promotion --- .drone-home.star | 14 --------- .drone/build.sh | 4 ++- .drone/deploy.sh | 9 +++--- .drone/drone-home.jsonnet | 23 +++++++++++++- .drone/drone-home.yml | 47 ++++++++++++++++++++++++++++- .drone/package.json | 2 +- .drone/scripts/initialise-image.sh | 15 +++++++++ .drone/scripts/initialise-images.sh | 2 ++ .drone/scripts/login.sh | 13 ++++++++ .drone/yarn.lock | 8 ++--- docker-compose.yml | 2 +- gitea/Dockerfile | 3 +- 12 files changed, 114 insertions(+), 28 deletions(-) delete mode 100644 .drone-home.star create mode 100644 .drone/scripts/initialise-image.sh create mode 100644 .drone/scripts/initialise-images.sh create mode 100644 .drone/scripts/login.sh diff --git a/.drone-home.star b/.drone-home.star deleted file mode 100644 index 6abbcc0..0000000 --- a/.drone-home.star +++ /dev/null @@ -1,14 +0,0 @@ - -load("@this//gitea:drone.star", "drone") -load("@this//gitea:stack-name.star", "stackName") -load("@this//gitea:stack-root.star", "stackRoot") - -def main(ctx): - return drone( - ctx, - "home-deploy", - stackRoot, - stackName, - [] - ) - \ No newline at end of file diff --git a/.drone/build.sh b/.drone/build.sh index 902ff99..ae99a81 100644 --- a/.drone/build.sh +++ b/.drone/build.sh @@ -1 +1,3 @@ -docker build gitea -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/gitea +docker build gitea \ + --build-arg REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ \ + -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/gitea diff --git a/.drone/deploy.sh b/.drone/deploy.sh index b88c261..61240d0 100644 --- a/.drone/deploy.sh +++ b/.drone/deploy.sh @@ -1,4 +1,5 @@ -docker stack rm gitea -echo 'sleeping...zzz' -sleep 60 -docker stack deploy -c docker-compose.yml gitea +export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ \ +&& docker stack rm gitea \ +&& echo 'sleeping...zzz' \ +&& sleep 60 \ +&& docker stack deploy -c docker-compose.yml gitea diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index 98bb080..31caabd 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -4,9 +4,30 @@ local publicSecrets = import 'lib/public-secrets.libsonnet'; local deploy = import 'node_modules/@sigyl/jsonnet-drone/deploy.libsonnet'; local register = import 'node_modules/@sigyl/jsonnet-drone/register.libsonnet'; +local registry = import 'node_modules/@sigyl/jsonnet-drone/registry.libsonnet'; + +local config = { + registry: '', +}; + [ register, - deploy( + registry( + config { + script: 'sh .drone/scripts/initialise-images.sh', + secrets: [], + }, + ) { + trigger +: { + event +: [ + 'promote', + ], + target +: [ + 'registry', + ], + }, + }, + deploy(config)( 'gitea', '/stack/', [], diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index eb9adfc..b1b8650 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -15,6 +15,52 @@ trigger: exclude: - promote +--- +kind: pipeline +type: docker +name: registry + +platform: + os: linux + arch: amd64 + +steps: +- name: "dockerpull and save docker images:" + image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f + commands: + - set -e + - export REGISTRY=$${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ + - sh .drone/scripts/initialise-images.sh $${REGISTRY} $${REGISTRY_PASSWORD} + volumes: + - name: dockersock + path: /var/run + +services: +- name: docker + image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f + privileged: true + volumes: + - name: dockersock + path: /var/run + - name: ca + path: /etc/docker/certs.d + +volumes: +- name: dockersock + temp: {} +- name: ca + host: + path: /etc/docker/certs.d + +image_pull_secrets: +- dockerconfigjson + +trigger: + event: + - promote + target: + - registry + --- kind: pipeline type: docker @@ -45,7 +91,6 @@ steps: - gitea_mailer_passwd script: - rm -f env-gitea - - echo $${DOMAIN} - "echo \"export GITEA_MAILER_HOST='$${GITEA_MAILER_HOST}'\" >> env-gitea # \"gitea-mailer-host\"" - "echo \"export GITEA_MAILER_FROM='$${GITEA_MAILER_FROM}'\" >> env-gitea # \"gitea-mailer-from\"" - "echo \"export GITEA_MAILER_USER='$${GITEA_MAILER_USER}'\" >> env-gitea # \"gitea-mailer-user\"" diff --git a/.drone/package.json b/.drone/package.json index 33bc5f1..0f0cc55 100644 --- a/.drone/package.json +++ b/.drone/package.json @@ -4,6 +4,6 @@ "build": "drone jsonnet --source drone-home.jsonnet --target drone-home.yml --stream" }, "dependencies": { - "@sigyl/jsonnet-drone": "^0.1.1" + "@sigyl/jsonnet-drone": "^0.3.1" } } diff --git a/.drone/scripts/initialise-image.sh b/.drone/scripts/initialise-image.sh new file mode 100644 index 0000000..5692e04 --- /dev/null +++ b/.drone/scripts/initialise-image.sh @@ -0,0 +1,15 @@ +n=0 +while : +do + docker pull $2 \ + && docker tag $2 $1$2 \ + && docker push $1$2 && break # substitute your command here + n=$((n+1)) + if [ $n -ge 10 ]; then + echo "initialise failed" + exit 1 + fi + echo "retrying..$n" + sleep 5 +done + diff --git a/.drone/scripts/initialise-images.sh b/.drone/scripts/initialise-images.sh new file mode 100644 index 0000000..9e04e6f --- /dev/null +++ b/.drone/scripts/initialise-images.sh @@ -0,0 +1,2 @@ +sh $(dirname $0)/login.sh $1 "$2" \ +&& sh $(dirname $0)/initialise-image.sh $1 gitea/gitea:1.12.3-linux-amd64 \ No newline at end of file diff --git a/.drone/scripts/login.sh b/.drone/scripts/login.sh new file mode 100644 index 0000000..730a4c8 --- /dev/null +++ b/.drone/scripts/login.sh @@ -0,0 +1,13 @@ +n=0 +while : +do + docker login $1 --username client --password $2 \ + && break # substitute your command here + n=$((n+1)) + if [ $n -ge 10 ]; then + echo "login failed" + exit 1 + fi + echo "retrying login..$n" + sleep 5 +done diff --git a/.drone/yarn.lock b/.drone/yarn.lock index 35ba3cd..f9b7ae3 100644 --- a/.drone/yarn.lock +++ b/.drone/yarn.lock @@ -12,10 +12,10 @@ resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone-environment/-/jsonnet-drone-environment-0.0.5.tgz#9ea85e08904777bd21a3e4b30b0b91461d0285ff" integrity sha512-xVGmdMO1pOyozAWUbJm6mzKBgsLPJ+1hWnGCK3AxPkr7kkDh18hu30+TLzlcQtqq76s5jUfvJUztezsGj/mIcw== -"@sigyl/jsonnet-drone@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.1.1.tgz#37afda650e8420a664e89c762236a1e59aa485d9" - integrity sha512-GR7LXYaUJYjkcWRyyLlwrBX9Jw04Vlcc/XS32rNaSz4wtrD9opvnmESxNC1UTWXsT/3ybuQhLhCboEb2GiTWmw== +"@sigyl/jsonnet-drone@^0.3.1": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.3.1.tgz#790a83f45556cc613f07fbc98ca760027fa936e7" + integrity sha512-FiSyunjR0Udc20I2gA6gkzX3sCB2dPq/ZODrXcm7ROQFKF2Wr4b+xhpovjEdnjKGy8G4d+rRcdN+Jyhp7WQLEg== dependencies: "@sigyl/jsonnet-compose" "^0.0.2" "@sigyl/jsonnet-drone-environment" "0.0.5" diff --git a/docker-compose.yml b/docker-compose.yml index 9b823a1..8a6f9a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: replicas: 1 restart_policy: condition: any - image: ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/gitea + image: ${LOCAL_DOCKER_REGISTRY}gitea environment: - USER_UID=1000 - USER_GID=1000 diff --git a/gitea/Dockerfile b/gitea/Dockerfile index ba48cc5..911aca3 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -1,4 +1,5 @@ -FROM gitea/gitea:1.12.3-linux-amd64 +ARG REGISTRY +FROM ${REGISTRY}gitea/gitea:1.12.3-linux-amd64 COPY app.ini /init/ COPY ./templates /init/templates/ COPY run.sh /