changed drone version

updated drone
2021-10-04 17:11:36 +01:00 · 2021-10-04 17:11:12 +01:00 · 2021-10-04 17:02:03 +01:00 · 2020-10-24 12:19:27 +01:00 · 2020-10-23 20:22:53 +01:00 · 2020-10-23 17:23:02 +01:00
89 changed files with 323 additions and 1514 deletions
--- 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 drone \
 && echo 'sleeping...zzz' \
 && sleep 60 \
-&& docker stack deploy -c docker-compose.yml drone
+&& docker stack deploy -c docker-compose.yml drone  --with-registry-auth
--- a/.drone/drone-home.jsonnet
+++ b/.drone/drone-home.jsonnet
@ -5,34 +5,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 droneImages = import 'node_modules/@sigyl/jsonnet-drone/drone-images.libsonnet';

 local config = {
  registry: '',
+  name: 'drone',
+  root: 'stack'
 };
+
+local defs = [
+  {
+    load: 'drone/drone:2.4.0@sha256:8c1c83ed0f68b00e16ca50b8769e6cf7ccb3c5ff390036eaec7e5fcb79c3cb92',
+    save: 'drone/drone:2.4.0'
+  },
+  {
+    load: 'drone/drone-runner-docker:1.6.3@sha256:0d6069fcb7a437d4526cca760e15d57e00ba3e7954a3fffd72b04e716a23312c',
+    save: 'drone/drone-runner-docker:1.6.3'
+  },
+];
+
 [
  register,
  registry(
    config {
-      script: 'sh .drone/scripts/initialise-images.sh',
      secrets: [
        'REGISTRY_DOMAIN',
        'REGISTRY_PORT',
        'REGISTRY_PASSWORD'
      ],
+      images: defs,
    },
-  ) {
-    trigger +: {
-      event +: [
-        'promote',
-      ],
-      target +: [
-        'registry',
-      ],
-    },
-  },
+  ),
+  save(config)(
+    defs,
+    [],
+  ),
+  print(config)(
+    [],
+    publicSecrets,
+    secretSecrets,
+  ),
+  build(config)(
+    [],
+  ),
+  droneImages(config),
  deploy(config)(
-    'drone',
-    '/stack/',
    [
      'REGISTRY_DOMAIN',
      'REGISTRY_PORT',
--- a/.drone/drone-home.yml
+++ b/.drone/drone-home.yml
@ -24,13 +24,33 @@ platform:
  os: linux
  arch: amd64

+clone:
+  disable: true
+
 steps:
- name: "dockerpull and save docker images:"
+- name: drone/drone:2.4.0
  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 drone/drone:2.4.0@sha256:8c1c83ed0f68b00e16ca50b8769e6cf7ccb3c5ff390036eaec7e5fcb79c3cb92 \\\\\n    && docker tag drone/drone:2.4.0@sha256:8c1c83ed0f68b00e16ca50b8769e6cf7ccb3c5ff390036eaec7e5fcb79c3cb92 $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.0 \\\\\n    && docker push $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.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"
+  environment:
+    REGISTRY_DOMAIN:
+      from_secret: registry-domain
+    REGISTRY_PASSWORD:
+      from_secret: registry-password
+    REGISTRY_PORT:
+      from_secret: registry-port
+  volumes:
+  - name: dockersock
+    path: /var/run
+
+- name: drone/drone-runner-docker:1.6.3
+  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 drone/drone-runner-docker:1.6.3@sha256:0d6069fcb7a437d4526cca760e15d57e00ba3e7954a3fffd72b04e716a23312c \\\\\n    && docker tag drone/drone-runner-docker:1.6.3@sha256:0d6069fcb7a437d4526cca760e15d57e00ba3e7954a3fffd72b04e716a23312c $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone-runner-docker:1.6.3 \\\\\n    && docker push $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone-runner-docker:1.6.3 && 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"
  environment:
    REGISTRY_DOMAIN:
      from_secret: registry-domain
@ -51,6 +71,8 @@ services:
    path: /var/run
  - name: ca
    path: /etc/docker/certs.d
+  - name: daemonjson
+    path: /etc/docker/daemon.json

 volumes:
 - name: dockersock
@ -58,6 +80,9 @@ volumes:
 - name: ca
  host:
    path: /etc/docker/certs.d
+- name: daemonjson
+  host:
+    path: /etc/docker/daemon.json

 image_pull_secrets:
 - dockerconfigjson
@ -71,7 +96,80 @@ 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/drone/built
+    - rm -f /stack/.images/drone/*.*
+    - rm -f /stack/.images/drone/built/*.*
+
+- name: drone/drone:2.4.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
+    - destination_registry
+    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/drone/drone/drone:2.4.0
+    - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.0 -o /stack/.images/drone/drone_drone:2.4.0.tar
+    - echo "docker load < drone_drone:2.4.0.tar" >> /stack/.images/drone/load.sh
+    - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone:2.4.0 $${DESTINATION_REGISTRY}/stack/drone/drone/drone:2.4.0" >> /stack/.images/drone/load.sh
+
+- name: drone/drone-runner-docker:1.6.3
+  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
+    - destination_registry
+    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/drone/drone/drone-runner-docker:1.6.3
+    - docker save $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone-runner-docker:1.6.3 -o /stack/.images/drone/drone_drone-runner-docker:1.6.3.tar
+    - echo "docker load < drone_drone-runner-docker:1.6.3.tar" >> /stack/.images/drone/load.sh
+    - echo "docker tag $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/stack/drone/drone/drone-runner-docker:1.6.3 $${DESTINATION_REGISTRY}/stack/drone/drone/drone-runner-docker:1.6.3" >> /stack/.images/drone/load.sh
+
+trigger:
+  event:
+  - promote
+  target:
+  - save
+
+---
+kind: pipeline
+type: docker
+name: print

 platform:
  os: linux
@ -87,11 +185,10 @@ steps:
    - drone_build_number
    - drone_repo_name
    - drone_repo_namespace
-    - registry_domain
-    - registry_port
-    - registry_password
    - scheme
    - domain
+    - registry_domain
+    - registry_port
    - drone_gitea_client_id
    - drone_gitea_server
    - drone_server_host
@ -101,13 +198,13 @@ steps:
    - drone_gitea_client_secret
    - drone_rpc_secret
    - ssh_key
+    - registry_password
    script:
    - rm -f env-drone
-    - "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 SCHEME='$${SCHEME}'\" >> env-drone # \"scheme\""
    - "echo \"export DOMAIN='$${DOMAIN}'\" >> env-drone # \"domain\""
+    - "echo \"export REGISTRY_DOMAIN='$${REGISTRY_DOMAIN}'\" >> env-drone # \"registry-domain\""
+    - "echo \"export REGISTRY_PORT='$${REGISTRY_PORT}'\" >> env-drone # \"registry-port\""
    - "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_SERVER_HOST='$${DRONE_SERVER_HOST}'\" >> env-drone # \"drone-server-host\""
@ -117,6 +214,7 @@ steps:
    - "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 SSH_KEY='$${SSH_KEY}'\" >> env-drone # \"ssh-key\""
+    - "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-drone # \"registry-password\""
  environment:
    DOMAIN:
      from_secret: domain
@ -147,6 +245,156 @@ steps:
    SSH_USERNAME:
      from_secret: ssh-username

+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=drone
+  - 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
+
+trigger:
+  event:
+  - promote
+  target:
+  - build
+
+---
+kind: pipeline
+type: docker
+name: drone-images
+
+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/drone/drone-images
+    - rm -f /stack/.images/drone/drone-images/*.*
+
+- name: docker
+  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:
+    - docker pull docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f
+    - docker save docker:19.03.12-dind@sha256:8dded163e463f4a59bf305b3dca98e312b2cfb89a43da3872e48f95a7554c48f -o /stack/.images/drone/drone-images/docker.tar
+    - echo "docker load docker.tar" >> /stack/.images/drone/drone-images/load.sh
+
+- name: scp
+  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:
+    - docker pull appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
+    - docker save appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47 -o /stack/.images/drone/drone-images/scp.tar
+    - echo "docker load scp.tar" >> /stack/.images/drone/drone-images/load.sh
+
+- name: ssh
+  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:
+    - docker pull appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
+    - docker save appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea -o /stack/.images/drone/drone-images/ssh.tar
+    - echo "docker load ssh.tar" >> /stack/.images/drone/drone-images/load.sh
+
+trigger:
+  event:
+  - promote
+  target:
+  - drone-images
+
+---
+kind: pipeline
+type: docker
+name: deploy
+
+platform:
+  os: linux
+  arch: amd64
+
+steps:
 - name: scp
  image: appleboy/drone-scp:1.6.2@sha256:bd37a55f4b97e7742b0de7333669b96220b3cc422d366e1fa8c34059b736ab47
  settings:
@ -155,32 +403,6 @@ steps:
    - .
    target: /stack/drone

- 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
-  environment:
-    REGISTRY_DOMAIN:
-      from_secret: registry-domain
-    REGISTRY_PASSWORD:
-      from_secret: registry-password
-    REGISTRY_PORT:
-      from_secret: registry-port
-    SCHEME:
-      from_secret: scheme
-  volumes:
-  - name: dockersock
-    path: /var/run
-
 - name: deploy
  image: appleboy/drone-ssh:1.6.2@sha256:b801dc2cd238c192b6e99acfa7bc3f5b9a03f312bd2feb1e10b3a7a28a1b80ea
  settings:
@ -190,7 +412,10 @@ steps:
    - drone_build_number
    - drone_repo_name
    - drone_repo_namespace
+    - scheme
    - domain
+    - registry_domain
+    - registry_port
    - drone_gitea_client_id
    - drone_gitea_server
    - drone_server_host
@ -200,6 +425,7 @@ steps:
    - drone_gitea_client_secret
    - drone_rpc_secret
    - ssh_key
+    - registry_password
    - registry_domain
    - registry_port
    - registry_password
@ -208,7 +434,11 @@ steps:
    - export DRONE_GITEA_CLIENT_SECRET=$${DRONE_GITEA_CLIENT_SECRET}
    - export DRONE_RPC_SECRET=$${DRONE_RPC_SECRET}
    - export SSH_KEY=$${SSH_KEY}
+    - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
+    - export SCHEME=$${SCHEME}
    - export DOMAIN=$${DOMAIN}
+    - export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
+    - export REGISTRY_PORT=$${REGISTRY_PORT}
    - export DRONE_GITEA_CLIENT_ID=$${DRONE_GITEA_CLIENT_ID}
    - export DRONE_GITEA_SERVER=$${DRONE_GITEA_SERVER}
    - export DRONE_SERVER_HOST=$${DRONE_SERVER_HOST}
@ -220,8 +450,10 @@ steps:
    - export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
    - export SCHEME=$${SCHEME}
    - set -e
+    - export NAME=drone
+    - export ROOT=stack
    - cd /stack/drone
-    - 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:
@ -254,27 +486,12 @@ steps:
    SSH_USERNAME:
      from_secret: ssh-username

-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
+  - promote
  target:
+  - deploy
  - production

 ...
--- a/.drone/lib/public-secrets.libsonnet
+++ b/.drone/lib/public-secrets.libsonnet
@ -1,5 +1,8 @@
 [
+  'scheme',
  'domain',
+  'registry-domain',
+  'registry-port',
  'drone-gitea-client-id',
  'drone-gitea-server',
  'drone-server-host',
--- a/.drone/lib/secret-secrets.libsonnet
+++ b/.drone/lib/secret-secrets.libsonnet
@ -1,5 +1,6 @@
 [
  'drone-gitea-client-secret',
  'drone-rpc-secret',
-  'ssh-key'
+  'ssh-key',
+  'registry-password',
 ]
--- a/.drone/login.sh
+++ b/.drone/login.sh
@ -1 +0,0 @@
-docker login ${REGISTRY_DOMAIN}:${REGISTRY_PORT} --username client --password "${REGISTRY_PASSWORD}"
--- a/.drone/logout.sh
+++ b/.drone/logout.sh
@ -1 +0,0 @@
-docker logout ${REGISTRY_DOMAIN}:${REGISTRY_PORT}
--- 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.4.0"
+    "@sigyl/jsonnet-drone": "^1.0.0"
  }
 }
--- a/.drone/scripts/initialise-image.sh
+++ b/.drone/scripts/initialise-image.sh
@ -1,16 +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
-
--- a/.drone/scripts/initialise-images.sh
+++ b/.drone/scripts/initialise-images.sh
@ -1,3 +0,0 @@
-sh $(dirname $0)/login.sh $1 "$2" \
-&& sh $(dirname $0)/initialise-image.sh $1 drone/drone:1.9.0 \
-&& sh $(dirname $0)/initialise-image.sh $1 drone/drone-runner-docker:1.5.0
--- a/.drone/scripts/login.sh
+++ b/.drone/scripts/login.sh
@ -1,14 +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
--- 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.4.0":
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-0.4.0.tgz#ebf7bc5e076d7252195fee7be2d1eafd24ee0435"
-  integrity sha512-96Adxqgo4SIU7skhiD0oPRproK4hy+Gvulym0p0bcSod5bv6b94BcYSfMyJye+sy6oRD0gosJY2uet1rgoB8UA==
+"@sigyl/jsonnet-drone@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@sigyl/jsonnet-drone/-/jsonnet-drone-1.0.0.tgz#943bd8a1abc8a916026944816709f5ed1d8e7ef8"
+  integrity sha512-ubyVC1/nAM584wTnnRBZTOP18z28Yy7SRApvSuo/3y2arngKlNI1FwOzKTFt/7L9+rNy19dRO/g0obEkyR3KmA==
  dependencies:
    "@sigyl/jsonnet-compose" "^0.0.2"
    "@sigyl/jsonnet-drone-environment" "0.0.5"
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -8,14 +8,14 @@ services:
      replicas: 1
      restart_policy:
        condition: any
-    image: ${LOCAL_DOCKER_REGISTRY}drone/drone:1.9.0
+    image: ${LOCAL_DOCKER_REGISTRY}drone/drone:2.4.0
    volumes:
-      - drone:/var/lib/drone
-      - drone-data:/data
+      - drone-5:/var/lib/drone
+      - drone-data-5:/data
    environment:
      - DRONE_LOGS_DEBUG=true
      - DRONE_LOGS_PRETTY=true
-      - DRONE_GITEA_SERVER=${SCHEME}://${DRONE_GITEA_SERVER}
+      - DRONE_GITEA_SERVER=${DRONE_GITEA_SERVER}
      - DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID}
      - DRONE_GITEA_CLIENT_SECRET=${DRONE_GITEA_CLIENT_SECRET}
      - DRONE_SERVER_HOST=${DRONE_SERVER_HOST} # tunnel hostname       
@ -37,7 +37,7 @@ services:
      replicas: 1
      restart_policy:
        condition: any
-    image: ${LOCAL_DOCKER_REGISTRY}drone/drone-runner-docker:1.5.0
+    image: ${LOCAL_DOCKER_REGISTRY}drone/drone-runner-docker:1.6.3
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
    environment:
@ -50,8 +50,8 @@ services:
    networks:
      - appnet
 volumes:
-  drone:
-  drone-data:
+  drone-5:
+  drone-data-5:

 networks:
  appnet:
--- a/drone-starlark/Dockerfile
+++ b/drone-starlark/Dockerfile
@ -1,8 +0,0 @@
-FROM drone/drone-convert-starlark:1.1.0-beta.1
-COPY repos /repos
-COPY run.sh /
-USER root
-RUN apk update
-RUN apk add gettext # enables envsubst
-ENTRYPOINT []
-CMD sh /run.sh
--- a/drone-starlark/repos/build-docker-folder.star
+++ b/drone-starlark/repos/build-docker-folder.star
@ -1,33 +0,0 @@
-load("@this//:environment.star", "environment")
-def buildDockerFolder(
-  dockerFile,
-  image,
-  tag,
-  folder,
-  name,
-):
-  return {
-    "name": "build-{name}".format(
-      name = name,
-    ),
-    "image": "docker:dind",
-    "volumes": [
-      {
-        "name": "dockersock",
-        "path": "/var/run",
-      },
-    ],
-    "environment": environment([
-      "local-docker-registry",
-      "registry-password",
-    ]),
-    "commands": [
-      "cd {folder}".format(folder=folder),
-      'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
-      "sh build-docker-folder.sh {dockerFile} {image} {tag}".format(
-        image = image,
-        dockerFile = dockerFile,
-        tag = tag,
-      ),
-    ],
-  }
--- a/drone-starlark/repos/build-folder.star
+++ b/drone-starlark/repos/build-folder.star
@ -1,24 +0,0 @@
-load("@this//:environment.star", "environment")
-def buildFolder(name, folder):
-  return {
-    "name": "build-{folder} {name}".format(
-      folder=folder,
-      name=name,
-    ),
-    "image": "docker:dind",
-    "volumes": [
-      {
-        "name": "dockersock",
-        "path": "/var/run",
-      },
-    ],
-    "environment": environment([
-      "local-docker-registry",
-      "registry-password",
-    ]),
-    "commands": [
-      "cd {folder}".format(folder=folder),
-      'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
-      "sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name),
-    ],
-  }
--- a/drone-starlark/repos/build.star
+++ b/drone-starlark/repos/build.star
@ -1,23 +0,0 @@
-load("@this//:environment.star", "environment")
-
-def build(name):
-  return {
-    "name": "build-{name}".format(name=name),
-    "image": "docker:dind",
-    "volumes": [
-      {
-        "name": "dockersock",
-        "path": "/var/run",
-      },
-    ],
-    "environment": environment([
-      "local-docker-registry",
-      "registry-password"
-    ]),
-    "commands": [
-      "cd {name}".format(name=name),
-      'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
-      "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name),
-      "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name),
-    ],
-  }
--- a/drone-starlark/repos/chat/drone.star
+++ b/drone-starlark/repos/chat/drone.star
@ -1,74 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//chat:public-secrets.star", "publicSecrets")
-load("@this//chat:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),          
-          wait(15, "wait"),
-          printSecrets(
-            "env-chat",
-            publicSecrets,
-            secretSecrets,
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/chat/public-secrets.star
+++ b/drone-starlark/repos/chat/public-secrets.star
@ -1,5 +0,0 @@
-publicSecrets = [
-  "git-domain",
-  "chat-admin-name",
-  "chat-admin-email",
-]
--- a/drone-starlark/repos/chat/secret-secrets.star
+++ b/drone-starlark/repos/chat/secret-secrets.star
@ -1,3 +0,0 @@
-secretSecrets = [
-  "chat-admin-password",
-]
--- a/drone-starlark/repos/chat/stack-name._star
+++ b/drone-starlark/repos/chat/stack-name._star
@ -1 +0,0 @@
-stackName='chat'
--- a/drone-starlark/repos/chat/stack-root._star
+++ b/drone-starlark/repos/chat/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/chat'
--- a/drone-starlark/repos/clear.star
+++ b/drone-starlark/repos/clear.star
@ -1,16 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-
-def clear(folder):   
-  return {
-    "name": "clear",
-    "image": "appleboy/drone-ssh",
-    "settings": {
-      "host": fromSecret("ssh-host"),
-      "port": fromSecret("ssh-port"),
-      "username": fromSecret("ssh-user"),
-      "password": fromSecret("ssh-password"),
-      "script": [
-        "rm -r -f {folder}".format(folder = folder),
-      ]
-    }
-  }
--- a/drone-starlark/repos/commento/drone.star
+++ b/drone-starlark/repos/commento/drone.star
@ -1,74 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//commento:public-secrets.star", "publicSecrets")
-load("@this//commento:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          printSecrets(
-            "env-commento",
-            publicSecrets,
-            secretSecrets,
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/commento/public-secrets.star
+++ b/drone-starlark/repos/commento/public-secrets.star
@ -1,11 +0,0 @@
-publicSecrets = [
-  "commento-origin",
-  "commento-smtp-host",
-  "commento-smtp-port",
-  "commento-smtp-username",
-  "commento-smtp-from-address",
-  "commento-forbid-new-owners",
-  "commento-postgres-db",
-  "commento-postgres-user",
-  "commento-github-key",
-]
--- a/drone-starlark/repos/commento/secret-secrets.star
+++ b/drone-starlark/repos/commento/secret-secrets.star
@ -1,6 +0,0 @@
-secretSecrets = [
-  "commento-smtp-password",
-  "commento-askimet-key",
-  "commento-postgres-password",
-  "commento-github-secret",
-]
--- a/drone-starlark/repos/commento/stack-name._star
+++ b/drone-starlark/repos/commento/stack-name._star
@ -1 +0,0 @@
-stackName='commento'
--- a/drone-starlark/repos/commento/stack-root._star
+++ b/drone-starlark/repos/commento/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/commento'
--- a/drone-starlark/repos/deploy-from-registry.star
+++ b/drone-starlark/repos/deploy-from-registry.star
@ -1,39 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:export.star", "export")
-
-def deploy(
-  filename,
-  name,
-  folder,
-  secrets,
-  commands,
-  ctx
-):
-  return {
-    "name": "deploy {name}".format(name = name),
-    "image": "appleboy/drone-ssh",
-    "environment": environment(secrets),
-    "settings": {
-      "envs": [x.replace("-", "_") for x in secrets ],
-      "host": fromSecret("ssh-host"),
-      "port": fromSecret("ssh-port"),
-      "username": fromSecret("ssh-root-user"),
-      "password": fromSecret("ssh-root-password"),
-      "script": [
-        "set -e"
-      ] +
-      map(export, secrets) + 
-      [
-        "export DRONE_REPO_LINK=$${{DRONE_GITEA_SERVER}}/{namespace}/{name}".format(name=ctx.repo.name, namespace=ctx.repo.namespace),
-        "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit),
-        "docker network prune -f",
-        "cd {folder}".format(folder=folder),
-        'docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"',
-        "docker stack rm {name}".format(name = name),
-        "sleep 30",
-        "docker stack deploy -c {filename} {name}".format(name= name, filename = filename),
-      ] + commands
-    }
-  }
--- a/drone-starlark/repos/deploy.star
+++ b/drone-starlark/repos/deploy.star
@ -1,38 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:export.star", "export")
-
-def deploy(
-  filename,
-  name,
-  folder,
-  secrets,
-  commands,
-  ctx
-):
-  return {
-    "name": "deploy {name}".format(name = name),
-    "image": "appleboy/drone-ssh",
-    "environment": environment(secrets),
-    "settings": {
-      "envs": [x.replace("-", "_") for x in secrets ],
-      "host": fromSecret("ssh-host"),
-      "port": fromSecret("ssh-port"),
-      "username": fromSecret("ssh-root-user"),
-      "password": fromSecret("ssh-root-password"),
-      "script": [
-        "set -e"
-      ] +
-      map(export, secrets) + 
-      [
-        "export DRONE_REPO_LINK=$${{DRONE_GITEA_SERVER}}/{namespace}/{name}".format(name=ctx.repo.name, namespace=ctx.repo.namespace),
-        "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit),
-        "docker network prune -f",
-        "cd {folder}".format(folder=folder),
-        "docker stack rm {name}".format(name = name),
-        "sleep 30",
-        "docker stack deploy -c {filename} {name}".format(name= name, filename = filename),
-      ] + commands
-    }
-  }
--- a/drone-starlark/repos/drone/drone.star
+++ b/drone-starlark/repos/drone/drone.star
@ -1,81 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//drone:public-secrets.star", "publicSecrets")
-load("@this//drone:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy-from-registry.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          build("drone-starlark"),
-          printSecrets(
-            "env-drone",
-            publicSecrets,
-            secretSecrets,
-          ),
-          pull(
-            "pull images",
-            [
-              "drone-starlark",
-            ],
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/drone/public-secrets.star
+++ b/drone-starlark/repos/drone/public-secrets.star
@ -1,7 +0,0 @@
-publicSecrets = [
-  "drone-domain",
-  "drone-gitea-client-id",
-  "drone-gitea-server",
-  "drone-server-host",
-  "local-docker-registry",
-]
--- a/drone-starlark/repos/drone/secret-secrets.star
+++ b/drone-starlark/repos/drone/secret-secrets.star
@ -1,6 +0,0 @@
-secretSecrets = [
-  "drone-convert-secret",
-  "drone-gitea-client-secret",
-  "drone-rpc-secret",
-  "registry-password",
-]
--- a/drone-starlark/repos/drone/stack-name._star
+++ b/drone-starlark/repos/drone/stack-name._star
@ -1 +0,0 @@
-stackName='drone'
--- a/drone-starlark/repos/drone/stack-root._star
+++ b/drone-starlark/repos/drone/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/drone'
--- a/drone-starlark/repos/echo-secret.star
+++ b/drone-starlark/repos/echo-secret.star
@ -1,7 +0,0 @@
-load("@this//:secret-to-environment.star", "secretToEnvironment")
-
-def echoSecret(secret):
-  return 'echo "export {environment}=???? ${environment}" >> ***filename*** # {secret}'.format(
-      secret = secret,
-      environment = secretToEnvironment(secret),
-    )
--- a/drone-starlark/repos/echo.star
+++ b/drone-starlark/repos/echo.star
@ -1,7 +0,0 @@
-load("@this//:secret-to-environment.star", "secretToEnvironment")
-
-def echo(secret):
-  return 'echo "export {environment}=\'${environment}\'" >> ***filename*** # {secret}'.format(
-      secret = secret,
-      environment = secretToEnvironment(secret),
-    )
--- a/drone-starlark/repos/environment.star
+++ b/drone-starlark/repos/environment.star
@ -1,5 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-def environment(env):
-  return dict(
-    [(x.replace("-", "_").upper(), fromSecret(x)) for x in env]
-  )
--- a/drone-starlark/repos/export.star
+++ b/drone-starlark/repos/export.star
@ -1,6 +0,0 @@
-load("@this//:secret-to-environment.star", "secretToEnvironment")
-
-def export(secret):
-  return "export {toCaps}=${toCaps}".format(
-    toCaps = secretToEnvironment(secret),
-  )
--- a/drone-starlark/repos/from-secret.star
+++ b/drone-starlark/repos/from-secret.star
@ -1,4 +0,0 @@
-def fromSecret(name):
-  return {
-    "from_secret": name
-  }
--- a/drone-starlark/repos/ghost/drone.star
+++ b/drone-starlark/repos/ghost/drone.star
@ -1,81 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//ghost:public-secrets.star", "publicSecrets")
-load("@this//ghost:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy-from-registry.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          printSecrets(
-            "env-ghost",
-            publicSecrets,
-            secretSecrets,
-          ),
-          build("ghost"),
-          pull(
-            "pull images",
-            [
-              "ghost",
-            ],
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/ghost/public-secrets.star
+++ b/drone-starlark/repos/ghost/public-secrets.star
@ -1,7 +0,0 @@
-publicSecrets = [
-  "git-domain",
-  "local-docker-registry",
-  "ghost-mail-service",
-  "ghost-mail-user",
-  "commento-origin",
-]
--- a/drone-starlark/repos/ghost/secret-secrets.star
+++ b/drone-starlark/repos/ghost/secret-secrets.star
@ -1,4 +0,0 @@
-secretSecrets = [
-  "ghost-mysql-root-password",
-  "registry-password",
-]
--- a/drone-starlark/repos/ghost/stack-name._star
+++ b/drone-starlark/repos/ghost/stack-name._star
@ -1 +0,0 @@
-stackName='ghost'
--- a/drone-starlark/repos/ghost/stack-root._star
+++ b/drone-starlark/repos/ghost/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/ghost'
--- a/drone-starlark/repos/gitea/drone.star
+++ b/drone-starlark/repos/gitea/drone.star
@ -1,81 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//gitea:public-secrets.star", "publicSecrets")
-load("@this//gitea:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy-from-registry.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          printSecrets(
-            "env-gitea",
-            publicSecrets,
-            secretSecrets,
-          ),
-          build("gitea"),
-          pull(
-            "pull images",
-            [
-              "gitea",
-            ],
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/gitea/public-secrets.star
+++ b/drone-starlark/repos/gitea/public-secrets.star
@ -1,8 +0,0 @@
-publicSecrets = [
-  "git-domain",
-  "local-docker-registry",
-  "gitea-mailer-host",
-  "gitea-mailer-from",
-  "gitea-mailer-user",
-  "gitea-app-name",
-]
--- a/drone-starlark/repos/gitea/secret-secrets.star
+++ b/drone-starlark/repos/gitea/secret-secrets.star
@ -1,8 +0,0 @@
-secretSecrets = [
-  "gitea-server-lfs-jwt-secret",
-  "gitea-security-secret-key",
-  "gitea-security-internal-token",
-  "gitea-oauth2-jwt-secret",
-  "gitea-mailer-passwd",
-  "registry-password",
-]
--- a/drone-starlark/repos/gitea/stack-name._star
+++ b/drone-starlark/repos/gitea/stack-name._star
@ -1 +0,0 @@
-stackName='gitea'
--- a/drone-starlark/repos/gitea/stack-root._star
+++ b/drone-starlark/repos/gitea/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/gitea'
--- a/drone-starlark/repos/guacamole/drone.star
+++ b/drone-starlark/repos/guacamole/drone.star
@ -1,81 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//guacamole:public-secrets.star", "publicSecrets")
-load("@this//guacamole:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy-from-registry.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          printSecrets(
-            "env-guacamole",
-            publicSecrets,
-            secretSecrets,
-          ),
-          build("guacamole-postgresql"),
-          pull(
-            "pull images",
-            [
-              "guacamole-postgresql",
-            ],
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/guacamole/public-secrets.star
+++ b/drone-starlark/repos/guacamole/public-secrets.star
@ -1,5 +0,0 @@
-publicSecrets = [
-  "local-docker-registry",
-  "guacamole-postgres-db",
-  "guacamole-postgres-user",
-]
--- a/drone-starlark/repos/guacamole/secret-secrets.star
+++ b/drone-starlark/repos/guacamole/secret-secrets.star
@ -1,4 +0,0 @@
-secretSecrets = [
-  "guacamole-postgres-password",
-  "registry-password",
-]
--- a/drone-starlark/repos/guacamole/stack-name._star
+++ b/drone-starlark/repos/guacamole/stack-name._star
@ -1 +0,0 @@
-stackName='guacamole'
--- a/drone-starlark/repos/guacamole/stack-root._star
+++ b/drone-starlark/repos/guacamole/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/guacamole'
--- a/drone-starlark/repos/huginn/drone.star
+++ b/drone-starlark/repos/huginn/drone.star
@ -1,74 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//huginn:public-secrets.star", "publicSecrets")
-load("@this//huginn:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),          
-          wait(15, "wait"),
-          printSecrets(
-            "env-huginn",
-            publicSecrets,
-            secretSecrets,
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/huginn/public-secrets.star
+++ b/drone-starlark/repos/huginn/public-secrets.star
@ -1,7 +0,0 @@
-publicSecrets = [
-  "smtp-domain",
-  "smtp-user-name",
-  "smtp-server",
-  "email-from-address",
-  "smtp-port",
-]
--- a/drone-starlark/repos/huginn/secret-secrets.star
+++ b/drone-starlark/repos/huginn/secret-secrets.star
@ -1,5 +0,0 @@
-secretSecrets = [
-  "smtp-password",
-  "invitation-code",
-  "database-password",
-]
--- a/drone-starlark/repos/huginn/stack-name._star
+++ b/drone-starlark/repos/huginn/stack-name._star
@ -1 +0,0 @@
-stackName='huginn'
--- a/drone-starlark/repos/huginn/stack-root._star
+++ b/drone-starlark/repos/huginn/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/huginn'
--- a/drone-starlark/repos/map.star
+++ b/drone-starlark/repos/map.star
@ -1,2 +0,0 @@
-def map(fn, l):
-  return [fn(x) for x in l]
--- a/drone-starlark/repos/matomo/drone.star
+++ b/drone-starlark/repos/matomo/drone.star
@ -1,74 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//matomo:public-secrets.star", "publicSecrets")
-load("@this//matomo:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          printSecrets(
-            "env-matomo",
-            publicSecrets,
-            secretSecrets,
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/matomo/public-secrets.star
+++ b/drone-starlark/repos/matomo/public-secrets.star
@ -1 +0,0 @@
-publicSecrets = []
--- a/drone-starlark/repos/matomo/secret-secrets.star
+++ b/drone-starlark/repos/matomo/secret-secrets.star
@ -1,4 +0,0 @@
-secretSecrets = [
-  "matomo-mysql-root-password",
-  "matomo-mysql-password",
-]
--- a/drone-starlark/repos/matomo/stack-name._star
+++ b/drone-starlark/repos/matomo/stack-name._star
@ -1 +0,0 @@
-stackName='matomo'
--- a/drone-starlark/repos/matomo/stack-root._star
+++ b/drone-starlark/repos/matomo/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/matomo'
--- a/drone-starlark/repos/pipeline.star
+++ b/drone-starlark/repos/pipeline.star
@ -1,32 +0,0 @@
-def pipeline(
-  name,
-  steps,
-  dependsOn,
-  volumes,
-  dockerVolumes
-):
-  return {
-    "kind": "pipeline",
-    "name": name,
-    "depends_on": dependsOn,
-    "steps": steps,
-    "services": [
-      {
-        "name": "docker",
-        "image": "docker:dind",
-        "privileged": True,
-        "volumes": [
-          {
-            "name": "dockersock",
-            "path": "/var/run",
-          },
-        ] + dockerVolumes,
-      }
-    ],
-    "volumes": [
-      {
-        "name": "dockersock",
-        "temp": {},
-      },
-    ] + volumes,
-  }
--- a/drone-starlark/repos/portainer/drone.star
+++ b/drone-starlark/repos/portainer/drone.star
@ -1,74 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//portainer:public-secrets.star", "publicSecrets")
-load("@this//portainer:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          printSecrets(
-            "env-portainer",
-            publicSecrets,
-            secretSecrets,
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/portainer/public-secrets.star
+++ b/drone-starlark/repos/portainer/public-secrets.star
@ -1 +0,0 @@
-publicSecrets = []
--- a/drone-starlark/repos/portainer/secret-secrets.star
+++ b/drone-starlark/repos/portainer/secret-secrets.star
@ -1 +0,0 @@
-secretSecrets = []
--- a/drone-starlark/repos/portainer/stack-name._star
+++ b/drone-starlark/repos/portainer/stack-name._star
@ -1 +0,0 @@
-stackName='portainer'
--- a/drone-starlark/repos/portainer/stack-root._star
+++ b/drone-starlark/repos/portainer/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/portainer'
--- a/drone-starlark/repos/print-secrets.star
+++ b/drone-starlark/repos/print-secrets.star
@ -1,24 +0,0 @@
-load("@this//:map.star", "map")
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-
-def printSecrets(filename, env, secretEnv):   
-  return {
-    "name": "print secrets",
-    "image": "appleboy/drone-ssh",
-    "environment": environment(env + secretEnv),
-    "settings": {
-      "envs": [x.replace("-", "_") for x in env + secretEnv ],
-      "host": fromSecret("ssh-host"),
-      "port": fromSecret("ssh-port"),
-      "username": fromSecret("ssh-user"),
-      "password": fromSecret("ssh-password"),
-      "script": [x.replace("***filename***", filename) for x in [
-        "rm -f ***filename***",
-      ] + map(echo, env) 
-      + map(echo, secretEnv)]
-    }
-  }
--- a/drone-starlark/repos/proxy/drone.star
+++ b/drone-starlark/repos/proxy/drone.star
@ -1,108 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//proxy:public-secrets.star", "publicSecrets")
-load("@this//proxy:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy-from-registry.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          printSecrets(
-            "env-proxy",
-            publicSecrets,
-            secretSecrets,
-          ),
-          build("ngrok-gitea"),
-          build("registry"),
-          build("letsencrypt-nginx"),
-          buildDockerFolder(
-            "Dockerfile.git",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-git",
-            "letsencrypt-nginx",
-            "git",
-          ),
-          buildDockerFolder(
-            "Dockerfile.huginn",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-huginn",
-            "letsencrypt-nginx",
-            "huginn",
-          ),
-          buildDockerFolder(
-            "Dockerfile.drone",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
-            "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone",
-            "letsencrypt-nginx",
-            "drone",
-          ),
-          pull(
-            "pull images",
-            [
-              "ngrok-gitea",
-              "registry",
-              "letsencrypt-git",
-              "letsencrypt-drone",
-              "letsencrypt-huginn",
-            ],
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/proxy/public-secrets.star
+++ b/drone-starlark/repos/proxy/public-secrets.star
@ -1,7 +0,0 @@
-publicSecrets = [
-  "certbot-email",
-  "drone-domain",
-  "huginn-domain",
-  "git-domain",
-  "local-docker-registry",
-]
--- a/drone-starlark/repos/proxy/secret-secrets.star
+++ b/drone-starlark/repos/proxy/secret-secrets.star
@ -1,5 +0,0 @@
-secretSecrets = [
-  "ngrok-auth-token",
-  "registry-password",
-  "new-registry-password",
-]
--- a/drone-starlark/repos/proxy/stack-name._star
+++ b/drone-starlark/repos/proxy/stack-name._star
@ -1 +0,0 @@
-stackName='proxy'
--- a/drone-starlark/repos/proxy/stack-root._star
+++ b/drone-starlark/repos/proxy/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/proxy'
--- a/drone-starlark/repos/pull.star
+++ b/drone-starlark/repos/pull.star
@ -1,31 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:export.star", "export")
-
-def pull(
-  name,
-  images,
-):
-  secrets = [
-    "local-docker-registry",
-    "registry-password",
-  ]
-  return {
-    "name": name,
-    "image": "appleboy/drone-ssh",
-    "environment": environment(secrets),
-    "settings": {
-      "envs": [x.replace("-", "_") for x in secrets ],
-      "host": fromSecret("ssh-host"),
-      "port": fromSecret("ssh-port"),
-      "username": fromSecret("ssh-root-user"),
-      "password": fromSecret("ssh-root-password"),
-      "script": [
-        "set -e"
-      ] +
-      map(export, secrets) +
-      ['docker login $${LOCAL_DOCKER_REGISTRY} --username client --password "$${REGISTRY_PASSWORD}"'] +
-      ["docker pull $${{LOCAL_DOCKER_REGISTRY}}{image}".format(image=image) for image in images ]
-    }
-  }
--- a/drone-starlark/repos/rescale.star
+++ b/drone-starlark/repos/rescale.star
@ -1,21 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-
-def rescale(
-  service,
-  scaleTo
-):
-  return {
-    "name": "rescale {service}".format(service=service),
-    "image": "appleboy/drone-ssh",
-    "settings": {
-      "host": fromSecret("ssh-host"),
-      "port": fromSecret("ssh-port"),
-      "username": fromSecret("ssh-root-user"),
-      "password": fromSecret("ssh-root-password"),
-      "script": [
-        "set -e",
-        "docker service scale {service}=0".format(service=service),
-        "docker service scale {service}={scaleTo}".format(service=service, scaleTo=scaleTo),
-      ]
-    }
-  }
--- a/drone-starlark/repos/scp.star
+++ b/drone-starlark/repos/scp.star
@ -1,25 +0,0 @@
-def scp(target):
-  return {
-    "name": "scp files",
-    "image": "appleboy/drone-scp",
-    "settings": {
-      "host": {
-        "from_secret": "ssh-host",
-      },
-      "username": {
-        "from_secret": "ssh-user",
-      },
-      "password": {
-        "from_secret": "ssh-password",
-      },
-      "port": {
-        "from_secret": "ssh-port",
-      },
-      "command_timeout": "2m",
-      "target": target,
-      "source": [
-        ".",
-      ],
-    },
-  }
-  
--- a/drone-starlark/repos/secret-to-environment.star
+++ b/drone-starlark/repos/secret-to-environment.star
@ -1,2 +0,0 @@
-def secretToEnvironment(secret):
-  return secret.replace("-", "_").upper()
--- a/drone-starlark/repos/wait.star
+++ b/drone-starlark/repos/wait.star
@ -1,8 +0,0 @@
-def wait(delay, name): 
-  return {
-    "name": name,
-    "image": "alpine",
-    "commands": [
-      "sleep {delay}".format(delay = delay),
-    ],
-  }
--- a/drone-starlark/repos/zabbix/drone.star
+++ b/drone-starlark/repos/zabbix/drone.star
@ -1,74 +0,0 @@
-load("@this//:from-secret.star", "fromSecret")
-load("@this//:print-secrets.star", "printSecrets")
-
-load("@this//:map.star", "map")
-load("@this//:environment.star", "environment")
-load("@this//:echo.star", "echo")
-load("@this//:export.star", "export")
-load("@this//:echo-secret.star", "echoSecret")
-load("@this//:wait.star", "wait")
-load("@this//:build.star", "build")
-load("@this//:scp.star", "scp")
-load("@this//zabbix:public-secrets.star", "publicSecrets")
-load("@this//zabbix:secret-secrets.star", "secretSecrets")
-load("@this//:rescale.star", "rescale")
-load("@this//:pull.star", "pull")
-load("@this//:deploy.star", "deploy")
-load("@this//:build-folder.star", "buildFolder")
-load("@this//:build-docker-folder.star", "buildDockerFolder")
-load("@this//:pipeline.star", "pipeline")
-
-def drone(
-  ctx,
-  branch,
-  base,
-  name,
-  commands,
-):
-  if ctx.build.branch == branch:
-    return [
-      pipeline(
-        branch,
-        [
-          scp(base),
-          wait(15, "wait"),
-          printSecrets(
-            "env-zabbix",
-            publicSecrets,
-            secretSecrets,
-          ),
-          deploy(
-            "docker-compose.yml",
-            name,
-            base,
-            publicSecrets + secretSecrets,
-            commands,
-            ctx
-          ),
-        ],
-        [],
-        [
-          {
-            "name": "ca",
-            "host": {
-              "path": "/etc/docker/certs.d",
-            },
-          }
-        ],
-        [
-          {
-            "name": "ca",
-            "path": "/etc/docker/certs.d",
-          },
-        ]
-      ),
-    ]
-  else:
-    return pipeline(
-      ctx.build.branch,
-      [],
-      [],
-      [],
-      [],
-    )
-      
--- a/drone-starlark/repos/zabbix/public-secrets.star
+++ b/drone-starlark/repos/zabbix/public-secrets.star
@ -1 +0,0 @@
-publicSecrets = []
--- a/drone-starlark/repos/zabbix/secret-secrets.star
+++ b/drone-starlark/repos/zabbix/secret-secrets.star
@ -1,4 +0,0 @@
-secretSecrets = [
-  "zabbix-mysql-root-password",
-  "zabbix-mysql-password",
-]
--- a/drone-starlark/repos/zabbix/stack-name._star
+++ b/drone-starlark/repos/zabbix/stack-name._star
@ -1 +0,0 @@
-stackName='zabbix'
--- a/drone-starlark/repos/zabbix/stack-root._star
+++ b/drone-starlark/repos/zabbix/stack-root._star
@ -1 +0,0 @@
-stackRoot='/stack/zabbix'
--- a/drone-starlark/run.sh
+++ b/drone-starlark/run.sh
@ -1,34 +0,0 @@
-envsubst < /repos/proxy/stack-name._star > /repos/proxy/stack-name.star
-envsubst < /repos/proxy/stack-root._star > /repos/proxy/stack-root.star
-
-envsubst < /repos/drone/stack-name._star > /repos/drone/stack-name.star
-envsubst < /repos/drone/stack-root._star > /repos/drone/stack-root.star
-
-envsubst < /repos/commento/stack-name._star > /repos/commento/stack-name.star
-envsubst < /repos/commento/stack-root._star > /repos/commento/stack-root.star
-
-envsubst < /repos/ghost/stack-name._star > /repos/ghost/stack-name.star
-envsubst < /repos/ghost/stack-root._star > /repos/ghost/stack-root.star
-
-envsubst < /repos/gitea/stack-name._star > /repos/gitea/stack-name.star
-envsubst < /repos/gitea/stack-root._star > /repos/gitea/stack-root.star
-
-envsubst < /repos/guacamole/stack-name._star > /repos/guacamole/stack-name.star
-envsubst < /repos/guacamole/stack-root._star > /repos/guacamole/stack-root.star
-
-envsubst < /repos/chat/stack-name._star > /repos/chat/stack-name.star
-envsubst < /repos/chat/stack-root._star > /repos/chat/stack-root.star
-
-envsubst < /repos/huginn/stack-name._star > /repos/huginn/stack-name.star
-envsubst < /repos/huginn/stack-root._star > /repos/huginn/stack-root.star
-
-envsubst < /repos/matomo/stack-name._star > /repos/matomo/stack-name.star
-envsubst < /repos/matomo/stack-root._star > /repos/matomo/stack-root.star
-
-envsubst < /repos/zabbix/stack-name._star > /repos/zabbix/stack-name.star
-envsubst < /repos/zabbix/stack-root._star > /repos/zabbix/stack-root.star
-
-envsubst < /repos/portainer/stack-name._star > /repos/portainer/stack-name.star
-envsubst < /repos/portainer/stack-root._star > /repos/portainer/stack-root.star
-
-/bin/drone-convert-starlark
Author	SHA1	Message	Date
Giles Bradshaw	c7cd0196aa	changed drone version continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details	2021-10-04 17:11:36 +01:00
Giles Bradshaw	7b188ff0ee	changed drone version	2021-10-04 17:11:12 +01:00
Giles Bradshaw	05b836e230	updated drone continuous-integration/drone/push Build is passing Details	2021-10-04 17:02:03 +01:00
Giles Bradshaw	8f4080f8a2	feat: destination_registry parameter for save continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details	2020-10-24 12:19:27 +01:00
Giles Bradshaw	e369cbb235	feat: drone-images continuous-integration/drone/push Build is passing Details continuous-integration/drone Build is passing Details	2020-10-23 20:22:53 +01:00
Giles Bradshaw	80f11d1968	fix: missing secrets	2020-10-23 17:23:02 +01:00
Giles Bradshaw	f01185276f	feat: promotions continuous-integration/drone/push Build is passing Details	2020-10-23 10:24:14 +01:00
Giles Bradshaw	9fae5c7e98	feat: http continuous-integration/drone/push Build is passing Details	2020-10-23 10:10:47 +01:00
				`@ -1 +0,0 @@`
				`docker login ${REGISTRY_DOMAIN}:${REGISTRY_PORT} --username client --password "${REGISTRY_PASSWORD}"`
				`@ -1 +0,0 @@`
				`docker logout ${REGISTRY_DOMAIN}:${REGISTRY_PORT}`