diff --git a/.drone/build.sh b/.drone/build.sh index 82f6787..a9d3369 100644 --- a/.drone/build.sh +++ b/.drone/build.sh @@ -1,3 +1,3 @@ docker build guacamole-postgresql \ - -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/guacamole-postgresql \ - --build-arg REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ + -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/guacamole-postgresql \ + --build-arg REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/ diff --git a/.drone/deploy.sh b/.drone/deploy.sh index 039c9d0..385fcdd 100644 --- a/.drone/deploy.sh +++ b/.drone/deploy.sh @@ -1,5 +1,5 @@ -export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/ \ +export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/ \ && docker stack rm guacamole \ && echo 'sleeping...zzz' \ && sleep 60 \ -&& docker stack deploy -c docker-compose.yml guacamole \ +&& docker stack deploy -c docker-compose.yml guacamole --with-registry-auth diff --git a/.drone/drone-home.jsonnet b/.drone/drone-home.jsonnet index 9d98589..1735ac2 100644 --- a/.drone/drone-home.jsonnet +++ b/.drone/drone-home.jsonnet @@ -4,31 +4,54 @@ 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 save = import 'node_modules/@sigyl/jsonnet-drone/save.libsonnet'; +local build = import 'node_modules/@sigyl/jsonnet-drone/build.libsonnet'; +local print = import 'node_modules/@sigyl/jsonnet-drone/print.libsonnet'; local config = { registry: '', + root: 'stack', + name: 'guacamole', }; +local defs = [ + { + load: 'postgres:12.4', + save: 'postgres:12.4' + }, + { + load: 'guacamole/guacd:1.2.0', + save: 'guacamole/guacd:1.2.0', + }, + { + load: 'guacamole/guacamole:1.2.0', + save: 'guacamole/guacamole:1.2.0', + }, +]; [ register, registry( config { - script: 'sh .drone/scripts/initialise-images.sh', + // script: 'sh .drone/scripts/initialise-images.sh', secrets: [], + images: defs, }, - ) { - trigger +: { - event +: [ - 'promote', - ], - target +: [ - 'registry', - ], - }, - }, + ), + save(config)( + defs, + [ + 'guacamole-postgresql', + ], + ), + print(config)( + [], + publicSecrets, + secretSecrets, + ), + build(config)( + [], + ), deploy(config)( - 'guacamole', - '/stack/', [], publicSecrets, secretSecrets, @@ -37,14 +60,5 @@ local config = { 'REGISTRY_PORT', 'REGISTRY_PASSWORD', ], - ) { - trigger +: { - event +: [ - 'promote', - ], - target +: [ - 'production', - ], - }, - }, + ), ] diff --git a/.drone/drone-home.yml b/.drone/drone-home.yml index 81ca826..bb0f91c 100644 --- a/.drone/drone-home.yml +++ b/.drone/drone-home.yml @@ -24,13 +24,36 @@ platform: os: linux arch: amd64 +clone: + disable: true + steps: -- name: "dockerpull and save docker images:" +- name: postgres:12.4 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} + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" + - "n=0\nwhile :\ndo\n docker pull postgres:12.4 \\\\\n && docker tag postgres:12.4 $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/postgres:12.4 \\\\\n && docker push $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/postgres:12.4 && break\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"initialise failed\"\n exit 1\n fi\n echo \"retrying..$n\"\n sleep 5\ndone\n" + volumes: + - name: dockersock + path: /var/run + +- name: guacamole/guacd:1.2.0 + image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f + commands: + - set -e + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" + - "n=0\nwhile :\ndo\n docker pull guacamole/guacd:1.2.0 \\\\\n && docker tag guacamole/guacd:1.2.0 $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacd:1.2.0 \\\\\n && docker push $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacd:1.2.0 && break\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"initialise failed\"\n exit 1\n fi\n echo \"retrying..$n\"\n sleep 5\ndone\n" + volumes: + - name: dockersock + path: /var/run + +- name: guacamole/guacamole:1.2.0 + image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f + commands: + - set -e + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" + - "n=0\nwhile :\ndo\n docker pull guacamole/guacamole:1.2.0 \\\\\n && docker tag guacamole/guacamole:1.2.0 $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacamole:1.2.0 \\\\\n && docker push $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacamole:1.2.0 && break\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"initialise failed\"\n exit 1\n fi\n echo \"retrying..$n\"\n sleep 5\ndone\n" volumes: - name: dockersock path: /var/run @@ -44,6 +67,8 @@ services: path: /var/run - name: ca path: /etc/docker/certs.d + - name: daemonjson + path: /etc/docker/daemon.json volumes: - name: dockersock @@ -51,6 +76,9 @@ volumes: - name: ca host: path: /etc/docker/certs.d +- name: daemonjson + host: + path: /etc/docker/daemon.json image_pull_secrets: - dockerconfigjson @@ -64,7 +92,116 @@ trigger: --- kind: pipeline type: docker -name: deploy +name: save + +platform: + os: linux + arch: amd64 + +clone: + disable: true + +steps: +- name: mkdir + image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea + settings: + envs: + - drone_tag + - drone_commit + - drone_build_number + - drone_repo_name + - drone_repo_namespace + script: + - mkdir -p /stack/.images/guacamole/built + - rm -f /stack/.images/guacamole/*.* + - rm -f /stack/.images/guacamole/built/*.* + +- name: postgres:12.4 + image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea + settings: + envs: + - drone_tag + - drone_commit + - drone_build_number + - drone_repo_name + - drone_repo_namespace + - registry_domain + - registry_port + - registry_password + script: + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" + - docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/postgres:12.4 + - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/postgres:12.4 -o /stack/.images/guacamole/postgres:12.4.tar + - echo "docker load postgres:12.4.tar" >> /stack/.images/guacamole/load.sh + - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/postgres:12.4 /stack/DOLLAR1/postgres:12.4" >> /stack/.images/guacamole/load.sh + +- name: guacamole/guacd:1.2.0 + image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea + settings: + envs: + - drone_tag + - drone_commit + - drone_build_number + - drone_repo_name + - drone_repo_namespace + - registry_domain + - registry_port + - registry_password + script: + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" + - docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacd:1.2.0 + - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacd:1.2.0 -o /stack/.images/guacamole/guacamole_guacd:1.2.0.tar + - echo "docker load guacamole_guacd:1.2.0.tar" >> /stack/.images/guacamole/load.sh + - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacd:1.2.0 /stack/DOLLAR1/guacamole/guacd:1.2.0" >> /stack/.images/guacamole/load.sh + +- name: guacamole/guacamole:1.2.0 + image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea + settings: + envs: + - drone_tag + - drone_commit + - drone_build_number + - drone_repo_name + - drone_repo_namespace + - registry_domain + - registry_port + - registry_password + script: + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" + - docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacamole:1.2.0 + - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacamole:1.2.0 -o /stack/.images/guacamole/guacamole_guacamole:1.2.0.tar + - echo "docker load guacamole_guacamole:1.2.0.tar" >> /stack/.images/guacamole/load.sh + - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole/guacamole:1.2.0 /stack/DOLLAR1/guacamole/guacamole:1.2.0" >> /stack/.images/guacamole/load.sh + +- name: guacamole-postgresql + image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea + settings: + envs: + - drone_tag + - drone_commit + - drone_build_number + - drone_repo_name + - drone_repo_namespace + - registry_domain + - registry_port + - registry_password + script: + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" + - docker pull $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole-postgresql + - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole-postgresql -o /stack/.images/guacamole/built/guacamole-postgresql.tar + - echo "docker load guacamole-postgresql.tar" >> /stack/.images/guacamole/built/load.sh + - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/guacamole/guacamole-postgresql /stack/DOLLAR1/guacamole-postgresql" >> /stack/.images/guacamole/built/load.sh + +trigger: + event: + - promote + target: + - sve + +--- +kind: pipeline +type: docker +name: print platform: os: linux @@ -80,22 +217,75 @@ steps: - drone_build_number - drone_repo_name - drone_repo_namespace - - postgres_db - - postgres_user - postgres_password script: - rm -f env-guacamole - - "echo \"export POSTGRES_DB='$${POSTGRES_DB}'\" >> env-guacamole # \"postgres-db\"" - - "echo \"export POSTGRES_USER='$${POSTGRES_USER}'\" >> env-guacamole # \"postgres-user\"" - "echo \"export POSTGRES_PASSWORD='$${POSTGRES_PASSWORD}'\" >> env-guacamole # \"postgres-password\"" environment: - POSTGRES_DB: - from_secret: postgres-db POSTGRES_PASSWORD: from_secret: postgres-password - POSTGRES_USER: - from_secret: postgres-user +trigger: + event: + - promote + target: + - print + +--- +kind: pipeline +type: docker +name: build + +platform: + os: linux + arch: amd64 + +steps: +- name: "dockerbuild:" + image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f + commands: + - set -e + - export NAME=guacamole + - export ROOT=stack + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" + - sh .drone/build.sh + - sh .drone/push.sh + 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 + - name: daemonjson + path: /etc/docker/daemon.json + +volumes: +- name: dockersock + temp: {} +- name: ca + host: + path: /etc/docker/certs.d +- name: daemonjson + host: + path: /etc/docker/daemon.json + +--- +kind: pipeline +type: docker +name: deploy + +platform: + os: linux + arch: amd64 + +steps: - name: scp image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47 settings: @@ -104,23 +294,6 @@ steps: - . target: /stack/guacamole -- name: wait - image: alpine:3.12.0@sha256:90baa0922fe90624b05cb5766fa5da4e337921656c2f8e2b13bd3c052a0baac1 - commands: - - sleep 15 - -- name: "dockerbuild:" - image: docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f - commands: - - set -e - - sh .drone/login.sh - - sh .drone/build.sh - - sh .drone/push.sh - - sh .drone/logout.sh - volumes: - - name: dockersock - path: /var/run - - name: deploy image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea settings: @@ -133,50 +306,27 @@ steps: - registry_domain - registry_port - registry_password - - postgres_db - - postgres_user - postgres_password script: - export POSTGRES_PASSWORD=$${POSTGRES_PASSWORD} - - export POSTGRES_DB=$${POSTGRES_DB} - - export POSTGRES_USER=$${POSTGRES_USER} - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN} - export REGISTRY_PORT=$${REGISTRY_PORT} - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD} - set -e + - export NAME=guacamole + - export ROOT=stack - cd /stack/guacamole - - sh .drone/login.sh + - "n=0\nwhile :\ndo\n docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n && break # substitute your command here\n n=$((n+1))\n if [ $n -ge 10 ]; then\n echo \"login failed\"\n exit 1\n fi\n echo \"retrying login..$n\"\n sleep 5\ndone\n" - sh .drone/pull.sh - sh .drone/deploy.sh environment: - POSTGRES_DB: - from_secret: postgres-db POSTGRES_PASSWORD: from_secret: postgres-password - POSTGRES_USER: - from_secret: postgres-user - -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 trigger: event: - promote target: - - production + - deploy ... diff --git a/.drone/lib/public-secrets.libsonnet b/.drone/lib/public-secrets.libsonnet index c6cd72e..fe51488 100644 --- a/.drone/lib/public-secrets.libsonnet +++ b/.drone/lib/public-secrets.libsonnet @@ -1,4 +1 @@ -[ - 'postgres-db', - 'postgres-user', -] +[] diff --git a/.drone/login.sh b/.drone/login.sh deleted file mode 100644 index 982ed2d..0000000 --- a/.drone/login.sh +++ /dev/null @@ -1 +0,0 @@ -docker login ${REGISTRY_DOMAIN}:${REGISTRY_PORT} --username client --password "${REGISTRY_PASSWORD}" \ No newline at end of file diff --git a/.drone/logout.sh b/.drone/logout.sh deleted file mode 100644 index 2337c7c..0000000 --- a/.drone/logout.sh +++ /dev/null @@ -1 +0,0 @@ -docker logout ${REGISTRY_DOMAIN}:${REGISTRY_PORT} \ No newline at end of file diff --git a/.drone/package.json b/.drone/package.json index 0f0cc55..a4a1c50 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.3.1" + "@sigyl/jsonnet-drone": "^0.4.2" } } diff --git a/.drone/pull.sh b/.drone/pull.sh index 6b74a0f..6228058 100644 --- a/.drone/pull.sh +++ b/.drone/pull.sh @@ -1 +1 @@ -docker pull ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/guacamole-postgresql +docker pull ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/guacamole-postgresql diff --git a/.drone/push.sh b/.drone/push.sh index d5faf8a..18edec7 100644 --- a/.drone/push.sh +++ b/.drone/push.sh @@ -1 +1 @@ -docker push ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/guacamole-postgresql +docker push ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/guacamole-postgresql diff --git a/.drone/scripts/initialise-image.sh b/.drone/scripts/initialise-image.sh deleted file mode 100644 index 5692e04..0000000 --- a/.drone/scripts/initialise-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -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 deleted file mode 100644 index 5b7fc9b..0000000 --- a/.drone/scripts/initialise-images.sh +++ /dev/null @@ -1,4 +0,0 @@ -sh $(dirname $0)/login.sh $1 "$2" \ -&& sh $(dirname $0)/initialise-image.sh $1 postgres:12.4 \ -&& sh $(dirname $0)/initialise-image.sh $1 guacamole/guacd:1.2.0 \ -&& sh $(dirname $0)/initialise-image.sh $1 guacamole/guacamole:1.2.0 diff --git a/.drone/scripts/login.sh b/.drone/scripts/login.sh deleted file mode 100644 index 730a4c8..0000000 --- a/.drone/scripts/login.sh +++ /dev/null @@ -1,13 +0,0 @@ -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 f9b7ae3..5901a6d 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.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== +"@sigyl/jsonnet-drone@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.2.tgz#8b34bae3a1a560414df5e3ecdf49c8f73c78771b" + integrity sha512-WBydSUcPkGtVQBzn6UmXiMcHPYow5/B0OFTpGdCD7h6EqUkvfJON+79NpXo7FOAt0PD2EQJzUVAkUBoMiUgfgw== 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 bb266a9..68ea012 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: environment: - POSTGRES_HOSTNAME=guacamole-postgresql - POSTGRES_PORT=5432 - - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_USER=guacamole_user - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_DATABASE=guacamole_db - GUACD_HOSTNAME=guacd