From 183efc7b392c2325c0ae48de686935fc850ba9cd Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 07:32:20 +0100 Subject: [PATCH 001/155] star --- .drone.m.yml | 238 ------------------------------------------------ .drone.star | 14 +++ .drone.yml | 248 --------------------------------------------------- 3 files changed, 14 insertions(+), 486 deletions(-) delete mode 100644 .drone.m.yml create mode 100644 .drone.star delete mode 100644 .drone.yml diff --git a/.drone.m.yml b/.drone.m.yml deleted file mode 100644 index e8928f4..0000000 --- a/.drone.m.yml +++ /dev/null @@ -1,238 +0,0 @@ ---- - -kind: pipeline -type: docker -name: default -when: - branch: - - remote - -clone: - # skip_verify: true - -steps: -steps: -- name: test-ssh - when: - branch: - - remote - image: appleboy/drone-ssh - environment: - DRONE_RPC_SECRET: - from_secret: drone-rpc-secret - DRONE_GITEA_CLIENT_ID: - from_secret: drone-gitea-client-id - DRONE_GITEA_CLIENT_SECRET: - from_secret: drone-gitea-client-secret - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - SSH_USER: - from_secret: ssh-user - CERTBOT_EMAIL: - from_secret: certbot-email - GIT_DOMAIN: - from_secret: git-domain - DRONE_DOMAIN: - from_secret: drone-domain - REMOTE_DOMAIN: - from_secret: remote-domain - settings: - envs: - - drone_rpc_secret - - drone_gitea_client_id - - drone_gitea_client_secret - - ssh_user - - local_docker_registry - - certbot_email - - git_domain - - drone_domain - - remote_domain - host: - from_secret: ssh-host - username: - from_secret: ssh-root-user - password: - from_secret: ssh-root-password - port: - from_secret: ssh-port - script: - - echo 'ssh ok' -- name: wait - when: - branch: - - remote - image: docker:dind - volumes: - - name: dockersock - path: /var/run - - commands: - - sleep 60 -- name: build-postgres - when: - branch: - - remote - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd guacamole-postgresql - - docker build . -t $${LOCAL_DOCKER_REGISTRY}/guacamole-postgresql - - docker push $${LOCAL_DOCKER_REGISTRY}/guacamole-postgresql -- name: build-ngrok - when: - branch: - - remote - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd ngrok2 - - docker build . -t $${LOCAL_DOCKER_REGISTRY}/ngrok-gitea - - docker push $${LOCAL_DOCKER_REGISTRY}/ngrok-gitea -- name: build-letsencrypt-nginx - when: - branch: - - remote - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - docker build . -t $${LOCAL_DOCKER_REGISTRY}/letsencrypt-nginx - - docker push $${LOCAL_DOCKER_REGISTRY}/letsencrypt-nginx -- name: build-letsencrypt-drone - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - sh build.sh drone $${LOCAL_DOCKER_REGISTRY} -- name: build-letsencrypt-remote - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - sh build.sh remote $${LOCAL_DOCKER_REGISTRY} -- name: scp files - when: - branch: - - remote - 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: ~/gitea-drone-stack - source: - - . -- name: deploy - when: - branch: - - remote - image: appleboy/drone-ssh - environment: - DRONE_RPC_SECRET: - from_secret: drone-rpc-secret - DRONE_GITEA_CLIENT_ID: - from_secret: drone-gitea-client-id - DRONE_GITEA_CLIENT_SECRET: - from_secret: drone-gitea-client-secret - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - SSH_USER: - from_secret: ssh-user - CERTBOT_EMAIL: - from_secret: certbot-email - GIT_DOMAIN: - from_secret: git-domain - DRONE_DOMAIN: - from_secret: drone-domain - REMOTE_DOMAIN: - from_secret: remote-domain - settings: - envs: - - drone_rpc_secret - - drone_gitea_client_id - - drone_gitea_client_secret - - ssh_user - - local_docker_registry - - certbot_email - - git_domain - - drone_domain - - remote_domain - host: - from_secret: ssh-host - username: - from_secret: ssh-root-user - password: - from_secret: ssh-root-password - port: - from_secret: ssh-port - script: - - set -e - - export LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY - - export DRONE_RPC_SECRET=$DRONE_RPC_SECRET - - export DRONE_GITEA_CLIENT_ID=$DRONE_GITEA_CLIENT_ID - - export DRONE_GITEA_CLIENT_SECRET=$DRONE_GITEA_CLIENT_SECRET - - export SSH_USER=$SSH_USER - - export CERTBOT_EMAIL=$CERTBOT_EMAIL - - export GIT_DOMAIN=$GIT_DOMAIN - - export DRONE_DOMAIN=$DRONE_DOMAIN - - export REMOTE_DOMAIN=$REMOTE_DOMAIN - - docker network prune -f - - cd /home/$SSH_USER/gitea-drone-stack - - docker stack rm remote-drone - - sleep 60 - - docker stack deploy -c docker-compose-drone.yml remote-drone - #- sleep 300 - -services: -- name: docker - image: docker:dind - privileged: true - volumes: - - name: dockersock - path: /var/run - - name: ca - path: /etc/docker/certs.d - -volumes: -- name: dockersock - temp: {} -- name: ca - host: - path: /home/giles/gitea-drone-stack/.ca diff --git a/.drone.star b/.drone.star new file mode 100644 index 0000000..ea6648e --- /dev/null +++ b/.drone.star @@ -0,0 +1,14 @@ +def main(ctx): + return { + "kind": "pipeline", + "name": "build", + "steps": [ + { + "name": "build" + "image": "alpine" + "commands": [ + "echo hello world" + ] + } + ] + } \ No newline at end of file diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 639275a..0000000 --- a/.drone.yml +++ /dev/null @@ -1,248 +0,0 @@ ---- - -kind: pipeline -type: docker -name: default -when: - branch: - - master - -clone: - # skip_verify: true - -steps: -steps: -- name: wait - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - - commands: - - sleep 60 -- name: build-postgres - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd guacamole-postgresql - - docker build . -t $${LOCAL_DOCKER_REGISTRY}/guacamole-postgresql - - docker push $${LOCAL_DOCKER_REGISTRY}/guacamole-postgresql -- name: build-ngrok - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd ngrok2 - - docker build . -t $${LOCAL_DOCKER_REGISTRY}/ngrok-gitea - - docker push $${LOCAL_DOCKER_REGISTRY}/ngrok-gitea -- name: build-letsencrypt-nginx - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - docker build . -t $${LOCAL_DOCKER_REGISTRY}/letsencrypt-nginx - - docker push $${LOCAL_DOCKER_REGISTRY}/letsencrypt-nginx -- name: build-letsencrypt-blog - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - sh build.sh blog $${LOCAL_DOCKER_REGISTRY} -- name: build-letsencrypt-drone - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - sh build.sh drone $${LOCAL_DOCKER_REGISTRY} -- name: build-letsencrypt-git - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - sh build.sh git $${LOCAL_DOCKER_REGISTRY} -- name: build-letsencrypt-remote - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - sh build.sh remote $${LOCAL_DOCKER_REGISTRY} -- name: build-letsencrypt-chat - when: - branch: - - master - image: docker:dind - volumes: - - name: dockersock - path: /var/run - environment: - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - commands: - - cd letsencrypt-nginx - - sh build.sh chat $${LOCAL_DOCKER_REGISTRY} -- name: scp files - when: - branch: - - master - 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: ~/gitea-drone-stack - source: - - . -- name: deploy - when: - branch: - - master - image: appleboy/drone-ssh - environment: - DRONE_RPC_SECRET: - from_secret: drone-rpc-secret - DRONE_GITEA_CLIENT_ID: - from_secret: drone-gitea-client-id - DRONE_GITEA_CLIENT_SECRET: - from_secret: drone-gitea-client-secret - LOCAL_DOCKER_REGISTRY: - from_secret: local-docker-registry - SSH_USER: - from_secret: ssh-user - CERTBOT_EMAIL: - from_secret: certbot-email - GIT_DOMAIN: - from_secret: git-domain - DRONE_DOMAIN: - from_secret: drone-domain - CHAT_DOMAIN: - from_secret: chat-domain - REMOTE_DOMAIN: - from_secret: remote-domain - BLOG_DOMAIN: - from_secret: blog-domain - settings: - envs: - - drone_rpc_secret - - drone_gitea_client_id - - drone_gitea_client_secret - - ssh_user - - local_docker_registry - - certbot_email - - git_domain - - drone_domain - - chat_domain - - remote_domain - - blog_domain - host: - from_secret: ssh-host - username: - from_secret: ssh-root-user - password: - from_secret: ssh-root-password - port: - from_secret: ssh-port - script: - - set -e - - export LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY - - export DRONE_RPC_SECRET=$DRONE_RPC_SECRET - - export DRONE_GITEA_CLIENT_ID=$DRONE_GITEA_CLIENT_ID - - export DRONE_GITEA_CLIENT_SECRET=$DRONE_GITEA_CLIENT_SECRET - - export SSH_USER=$SSH_USER - - export CERTBOT_EMAIL=$CERTBOT_EMAIL - - export GIT_DOMAIN=$GIT_DOMAIN - - export DRONE_DOMAIN=$DRONE_DOMAIN - - export CHAT_DOMAIN=$CHAT_DOMAIN - - export REMOTE_DOMAIN=$REMOTE_DOMAIN - - export BLOG_DOMAIN=$BLOG_DOMAIN - - docker network prune -f - - cd /home/$SSH_USER/gitea-drone-stack - - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-git - - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-chat - - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-remote - - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-blog - - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-drone - - docker stack rm gitea - - sleep 60 - - docker stack deploy -c docker-compose.yml gitea - #- sleep 300 - -services: -- name: docker - image: docker:dind - privileged: true - volumes: - - name: dockersock - path: /var/run - - name: ca - path: /etc/docker/certs.d - -volumes: -- name: dockersock - temp: {} -- name: ca - host: - path: /home/giles/gitea-drone-stack/.ca From 78562bad63237c13b2dd71380c63b8393d049df4 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 07:41:06 +0100 Subject: [PATCH 002/155] star --- .drone.star | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.star b/.drone.star index ea6648e..3309f07 100644 --- a/.drone.star +++ b/.drone.star @@ -4,11 +4,11 @@ def main(ctx): "name": "build", "steps": [ { - "name": "build" - "image": "alpine" + "name": "build", + "image": "alpine", "commands": [ - "echo hello world" - ] - } - ] + "echo hello world", + ], + }, + ], } \ No newline at end of file From 621d7a2f66ac28bcac072612a924886092a961ce Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 07:53:19 +0100 Subject: [PATCH 003/155] star --- docker-compose-home.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 3921e46..2e0245c 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -143,8 +143,7 @@ services: - DRONE_AGENTS_ENABLED=true - DRONE_CONVERT_PLUGIN_ENDPOINT=http://drone-starlark:3000 - DRONE_CONVERT_PLUGIN_SECRET=${DRONE_CONVERT_SECRET} - #- DRONE_ENV_PLUGIN_ENDPOINT=http://git.local-domain:8888 - #- DRONE_ENV_PLUGIN_TOKEN=anything + - DRONE_STARLARK_REPO_PATHS=this:/home/giles/gitea-drone-stack networks: - appnet drone-docker-runner: @@ -165,8 +164,6 @@ services: - DRONE_RPC_SECRET=${DRONE_RPC_SECRET} - DRONE_RUNNER_CAPACITY=8 - DRONE_RUNNER_NAME="docker-runner" - #- DRONE_ENV_PLUGIN_ENDPOINT=http://git.local-domain:8888 - #- DRONE_ENV_PLUGIN_TOKEN=anything drone-starlark: deploy: placement: From 0285b1f01e027d48ecd2da8a8789cb4a43b45fa4 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 07:58:20 +0100 Subject: [PATCH 004/155] star --- .drone.star | 30 +++++++++++++++++------------- steps.star | 14 ++++++++++++++ 2 files changed, 31 insertions(+), 13 deletions(-) create mode 100644 steps.star diff --git a/.drone.star b/.drone.star index 3309f07..50f3e7f 100644 --- a/.drone.star +++ b/.drone.star @@ -1,14 +1,18 @@ +load("@this//:steps.star", "steps") + def main(ctx): - return { - "kind": "pipeline", - "name": "build", - "steps": [ - { - "name": "build", - "image": "alpine", - "commands": [ - "echo hello world", - ], - }, - ], - } \ No newline at end of file + return steps() + + #return { + # "kind": "pipeline", + # "name": "build", + # "steps": [ + # { + # "name": "build", + # "image": "alpine", + # "commands": [ + # "echo hello world", + # ], + # }, + # ], + #} \ No newline at end of file diff --git a/steps.star b/steps.star new file mode 100644 index 0000000..fc245b9 --- /dev/null +++ b/steps.star @@ -0,0 +1,14 @@ +def steps(ctx): + return { + "kind": "pipeline", + "name": "build", + "steps": [ + { + "name": "build", + "image": "alpine", + "commands": [ + "echo hello world", + ], + }, + ], + } \ No newline at end of file From ee0837002b1df3306ef9e1bad2af8e0bbaccc547 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 09:07:28 +0100 Subject: [PATCH 005/155] . --- steps.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steps.star b/steps.star index fc245b9..ca779f6 100644 --- a/steps.star +++ b/steps.star @@ -1,4 +1,4 @@ -def steps(ctx): +def steps(): return { "kind": "pipeline", "name": "build", From b3f2f749e0799e7d1f7641847efd83433975e472 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 09:10:32 +0100 Subject: [PATCH 006/155] . --- .drone.star | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.drone.star b/.drone.star index 50f3e7f..818a28a 100644 --- a/.drone.star +++ b/.drone.star @@ -1,18 +1,18 @@ -load("@this//:steps.star", "steps") +# load("@this//:steps.star", "steps") def main(ctx): - return steps() + # return steps() - #return { - # "kind": "pipeline", - # "name": "build", - # "steps": [ - # { - # "name": "build", - # "image": "alpine", - # "commands": [ - # "echo hello world", - # ], - # }, - # ], - #} \ No newline at end of file + return { + "kind": "pipeline", + "name": "build", + "steps": [ + { + "name": "build", + "image": "alpine", + "commands": [ + "echo hello world", + ], + }, + ], + } \ No newline at end of file From a12bc885575e4f10a55e19a3b0fdcecae1153158 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 10:28:17 +0100 Subject: [PATCH 007/155] . --- .drone.star | 2 +- docker-compose-home.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 818a28a..472c9e9 100644 --- a/.drone.star +++ b/.drone.star @@ -1,4 +1,4 @@ -# load("@this//:steps.star", "steps") +load("@this//:steps.star", "steps") def main(ctx): # return steps() diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 2e0245c..046157f 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -143,9 +143,11 @@ services: - DRONE_AGENTS_ENABLED=true - DRONE_CONVERT_PLUGIN_ENDPOINT=http://drone-starlark:3000 - DRONE_CONVERT_PLUGIN_SECRET=${DRONE_CONVERT_SECRET} - - DRONE_STARLARK_REPO_PATHS=this:/home/giles/gitea-drone-stack + - DRONE_STARLARK_REPO_PATHS=this:/repos networks: - appnet + volumes: + - home/giles/gitea-drone-stack:/repos drone-docker-runner: deploy: placement: From 97781f12e34374bb4d0f87599f0779f12e7d76ad Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 10:28:17 +0100 Subject: [PATCH 008/155] . --- .drone.star | 2 +- docker-compose-home.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 818a28a..472c9e9 100644 --- a/.drone.star +++ b/.drone.star @@ -1,4 +1,4 @@ -# load("@this//:steps.star", "steps") +load("@this//:steps.star", "steps") def main(ctx): # return steps() diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 2e0245c..046157f 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -143,9 +143,11 @@ services: - DRONE_AGENTS_ENABLED=true - DRONE_CONVERT_PLUGIN_ENDPOINT=http://drone-starlark:3000 - DRONE_CONVERT_PLUGIN_SECRET=${DRONE_CONVERT_SECRET} - - DRONE_STARLARK_REPO_PATHS=this:/home/giles/gitea-drone-stack + - DRONE_STARLARK_REPO_PATHS=this:/repos networks: - appnet + volumes: + - home/giles/gitea-drone-stack:/repos drone-docker-runner: deploy: placement: From 07e8963b58df25f497e77a06657c63da19d556df Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 10:35:48 +0100 Subject: [PATCH 009/155] . --- .drone.home.yml | 18 +++++++++--------- docker-compose-home.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.home.yml b/.drone.home.yml index c4b9158..81a148e 100644 --- a/.drone.home.yml +++ b/.drone.home.yml @@ -59,7 +59,7 @@ steps: - name: build-postgres when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock @@ -74,7 +74,7 @@ steps: - name: build-ngrok when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock @@ -89,7 +89,7 @@ steps: - name: build-letsencrypt-nginx when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock @@ -104,7 +104,7 @@ steps: - name: build-nginx-home when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock @@ -118,7 +118,7 @@ steps: - name: build-letsencrypt-blog when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock @@ -132,7 +132,7 @@ steps: - name: build-letsencrypt-drone when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock @@ -146,7 +146,7 @@ steps: - name: build-letsencrypt-git when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock @@ -160,7 +160,7 @@ steps: - name: build-letsencrypt-remote when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock @@ -174,7 +174,7 @@ steps: - name: build-letsencrypt-chat when: branch: - - home-deploy + - home-deploy-skip image: docker:dind volumes: - name: dockersock diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 046157f..aedad72 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -147,7 +147,7 @@ services: networks: - appnet volumes: - - home/giles/gitea-drone-stack:/repos + - /home/giles/gitea-drone-stack:/repos drone-docker-runner: deploy: placement: From 4cf2aef63041715f8909b997f9d1995c409b7ab9 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 10:36:39 +0100 Subject: [PATCH 010/155] . --- .drone.home.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.home.yml b/.drone.home.yml index 81a148e..f071958 100644 --- a/.drone.home.yml +++ b/.drone.home.yml @@ -283,7 +283,7 @@ steps: - docker network prune -f - cd /home/$SSH_USER/gitea-drone-stack - docker stack rm gitea - - sleep 60 + - sleep 15 - docker stack deploy -c docker-compose-home.yml gitea #- sleep 300 From 4df4998dcfccb8e1ea3adcb5da3123b10b2ebec3 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 10:37:40 +0100 Subject: [PATCH 011/155] . --- .drone.home.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.home.yml b/.drone.home.yml index f071958..a1f77e7 100644 --- a/.drone.home.yml +++ b/.drone.home.yml @@ -55,7 +55,7 @@ steps: path: /var/run commands: - - sleep 60 + - sleep 15 - name: build-postgres when: branch: From 49d10969aa6dca21e8e8a8be0479e5037466f130 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 10:56:09 +0100 Subject: [PATCH 013/155] . --- .drone.home.yml | 2 +- .drone.star | 17 ++--------------- docker-compose-home.yml | 6 +++--- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.drone.home.yml b/.drone.home.yml index a1f77e7..5ea8628 100644 --- a/.drone.home.yml +++ b/.drone.home.yml @@ -283,7 +283,7 @@ steps: - docker network prune -f - cd /home/$SSH_USER/gitea-drone-stack - docker stack rm gitea - - sleep 15 + - sleep 60 - docker stack deploy -c docker-compose-home.yml gitea #- sleep 300 diff --git a/.drone.star b/.drone.star index 472c9e9..fa74b2d 100644 --- a/.drone.star +++ b/.drone.star @@ -1,18 +1,5 @@ load("@this//:steps.star", "steps") def main(ctx): - # return steps() - - return { - "kind": "pipeline", - "name": "build", - "steps": [ - { - "name": "build", - "image": "alpine", - "commands": [ - "echo hello world", - ], - }, - ], - } \ No newline at end of file + return steps() + \ No newline at end of file diff --git a/docker-compose-home.yml b/docker-compose-home.yml index aedad72..7283c90 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -143,11 +143,8 @@ services: - DRONE_AGENTS_ENABLED=true - DRONE_CONVERT_PLUGIN_ENDPOINT=http://drone-starlark:3000 - DRONE_CONVERT_PLUGIN_SECRET=${DRONE_CONVERT_SECRET} - - DRONE_STARLARK_REPO_PATHS=this:/repos networks: - appnet - volumes: - - /home/giles/gitea-drone-stack:/repos drone-docker-runner: deploy: placement: @@ -177,8 +174,11 @@ services: environment: - DRONE_DEBUG=true - DRONE_SECRET=${DRONE_CONVERT_SECRET} + - DRONE_STARLARK_REPO_PATHS=this:/repos networks: - appnet + volumes: + - /home/giles/gitea-drone-stack:/repos registry: deploy: From 349b744cfc7a3f2434977227e48c86b6ed1f95d2 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 11:03:53 +0100 Subject: [PATCH 014/155] . --- .drone.star | 2 +- steps.star => starlark/steps.star | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename steps.star => starlark/steps.star (82%) diff --git a/.drone.star b/.drone.star index fa74b2d..98b7293 100644 --- a/.drone.star +++ b/.drone.star @@ -1,4 +1,4 @@ -load("@this//:steps.star", "steps") +load("@this//starlark:steps.star", "steps") def main(ctx): return steps() diff --git a/steps.star b/starlark/steps.star similarity index 82% rename from steps.star rename to starlark/steps.star index ca779f6..f1f97f3 100644 --- a/steps.star +++ b/starlark/steps.star @@ -7,7 +7,7 @@ def steps(): "name": "build", "image": "alpine", "commands": [ - "echo hello world", + "echo hello 'star lark'", ], }, ], From 10cec727247f1a5c7bc5bf6e37494edb84b04bde Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 11:07:57 +0100 Subject: [PATCH 015/155] . --- .drone.star | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 98b7293..689af43 100644 --- a/.drone.star +++ b/.drone.star @@ -1,4 +1,17 @@ -load("@this//starlark:steps.star", "steps") +def steps(): + return { + "kind": "pipeline", + "name": "build", + "steps": [ + { + "name": "build", + "image": "alpine", + "commands": [ + "echo hello 'star lark'", + ], + }, + ], + } def main(ctx): return steps() From 190374791b0325665e747fcfc7740bf33613104c Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 11:10:50 +0100 Subject: [PATCH 016/155] . --- .drone.star | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 689af43..87fd309 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ -def steps(): +def steps(name): return { "kind": "pipeline", - "name": "build", + "name": name, "steps": [ { "name": "build", @@ -14,5 +14,8 @@ def steps(): } def main(ctx): - return steps() + return [ + steps('first'), + steps('second'), + ] \ No newline at end of file From 09f6af11851498d94785fa8ee41fe9eb24ec7923 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 11:12:00 +0100 Subject: [PATCH 017/155] . --- .drone.star | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.star b/.drone.star index 87fd309..c0e910c 100644 --- a/.drone.star +++ b/.drone.star @@ -2,6 +2,9 @@ def steps(name): return { "kind": "pipeline", "name": name, + "clone": { + "disable": true, + }, "steps": [ { "name": "build", From d3173ac98deccc67f88fa3792abdf06a1f2046f1 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 11:12:30 +0100 Subject: [PATCH 018/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index c0e910c..e97b4b6 100644 --- a/.drone.star +++ b/.drone.star @@ -3,7 +3,7 @@ def steps(name): "kind": "pipeline", "name": name, "clone": { - "disable": true, + "disable": 1, }, "steps": [ { From 355009f2f1f393717da770a137db67eee18026e0 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 11:13:30 +0100 Subject: [PATCH 019/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index e97b4b6..a7f77ab 100644 --- a/.drone.star +++ b/.drone.star @@ -3,7 +3,7 @@ def steps(name): "kind": "pipeline", "name": name, "clone": { - "disable": 1, + "disable": True, }, "steps": [ { From c07c78f4cef203213070c866d879da90bb064830 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 11:29:25 +0100 Subject: [PATCH 020/155] . --- .drone.star | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/.drone.star b/.drone.star index a7f77ab..3be7dcb 100644 --- a/.drone.star +++ b/.drone.star @@ -1,3 +1,37 @@ +def fromSecret(name): + return { + "from_secret": name + } +def printenv(): + return { + "name": "printenv", + "image": "appleboy/drone-ssh", + "environment": { + "LOCAL_DOCKER_REGISTRY": fromSecret("local-docker-registry"), + "SSH_HOST": fromSecret("ssh-host"), + "SSH_USER": fromSecret("ssh-user"), + "SSH_PORT": fromSecret("ssh-port"), + }, + "settings": { + "envs": [ + "local_docker_registry", + "ssh_host", + "ssh_user", + "ssh_port", + ], + "host": fromSecret("ssh-host"), + "port": fromSecret("ssh-port"), + "username": fromSecret("ssh-user"), + "password": fromSecret("ssh-password"), + "script": [ + "echo SSH_HOST=$SSH_HOST > env-stack", + "echo SSH_PORT=$SSH_PORT >> env-stack", + "echo LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY >> env-stack", + ] + } + + + } def steps(name): return { "kind": "pipeline", @@ -18,6 +52,7 @@ def steps(name): def main(ctx): return [ + printenv(), steps('first'), steps('second'), ] From 68f640f892b8972d69429c78f9446caca1086cde Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 11:32:31 +0100 Subject: [PATCH 021/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 3be7dcb..f543283 100644 --- a/.drone.star +++ b/.drone.star @@ -40,6 +40,7 @@ def steps(name): "disable": True, }, "steps": [ + printenv(), { "name": "build", "image": "alpine", @@ -52,7 +53,6 @@ def steps(name): def main(ctx): return [ - printenv(), steps('first'), steps('second'), ] From f37cc4ac1e94552dcaee71df7a36b835c9f1b643 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 12:42:31 +0100 Subject: [PATCH 022/155] . --- .drone.star | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.star b/.drone.star index f543283..e5515a4 100644 --- a/.drone.star +++ b/.drone.star @@ -2,7 +2,7 @@ def fromSecret(name): return { "from_secret": name } -def printenv(): +def printSecrets(env): return { "name": "printenv", "image": "appleboy/drone-ssh", @@ -13,12 +13,7 @@ def printenv(): "SSH_PORT": fromSecret("ssh-port"), }, "settings": { - "envs": [ - "local_docker_registry", - "ssh_host", - "ssh_user", - "ssh_port", - ], + "envs": [x.replace("-", "_") for x in env], "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), @@ -40,7 +35,12 @@ def steps(name): "disable": True, }, "steps": [ - printenv(), + printSecrets([ + "local-docker-registry", + "ssh-host", + "ssh-user", + "ssh-port", + ]), { "name": "build", "image": "alpine", From 98ca438c47dcff814339ff505b52281d448a8abc Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 12:50:26 +0100 Subject: [PATCH 023/155] . --- .drone.star | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.drone.star b/.drone.star index e5515a4..d1060d6 100644 --- a/.drone.star +++ b/.drone.star @@ -2,16 +2,15 @@ def fromSecret(name): return { "from_secret": name } +dev environment(env): + value={} + return value.update(x.replace("-", "_").upper(), fromSecret(x)) for x in env + def printSecrets(env): return { "name": "printenv", "image": "appleboy/drone-ssh", - "environment": { - "LOCAL_DOCKER_REGISTRY": fromSecret("local-docker-registry"), - "SSH_HOST": fromSecret("ssh-host"), - "SSH_USER": fromSecret("ssh-user"), - "SSH_PORT": fromSecret("ssh-port"), - }, + "environment": environment(env), "settings": { "envs": [x.replace("-", "_") for x in env], "host": fromSecret("ssh-host"), From 385007f492cccd088a6e43f7123e2d308a48ac61 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 12:52:21 +0100 Subject: [PATCH 024/155] . --- .drone.star | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index d1060d6..f6213ab 100644 --- a/.drone.star +++ b/.drone.star @@ -3,8 +3,10 @@ def fromSecret(name): "from_secret": name } dev environment(env): - value={} - return value.update(x.replace("-", "_").upper(), fromSecret(x)) for x in env + + return dict( + [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] + ) def printSecrets(env): return { From d254a592af13cf2186463bdc2db96b617ed444eb Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 12:53:10 +0100 Subject: [PATCH 025/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index f6213ab..648483f 100644 --- a/.drone.star +++ b/.drone.star @@ -2,7 +2,7 @@ def fromSecret(name): return { "from_secret": name } -dev environment(env): +def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] From c12254e6222920e542eeee5a390375e3d395d3a0 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 12:56:35 +0100 Subject: [PATCH 026/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 648483f..b9c0d09 100644 --- a/.drone.star +++ b/.drone.star @@ -3,14 +3,13 @@ def fromSecret(name): "from_secret": name } def environment(env): - return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] ) def printSecrets(env): return { - "name": "printenv", + "name": "print secrets", "image": "appleboy/drone-ssh", "environment": environment(env), "settings": { @@ -20,6 +19,7 @@ def printSecrets(env): "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), "script": [ + "rm env-stack", "echo SSH_HOST=$SSH_HOST > env-stack", "echo SSH_PORT=$SSH_PORT >> env-stack", "echo LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY >> env-stack", From c2f0577be3ec3caddb15faabe693550fe868a737 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 12:58:36 +0100 Subject: [PATCH 027/155] . --- .drone.star | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index b9c0d09..1c65066 100644 --- a/.drone.star +++ b/.drone.star @@ -19,10 +19,13 @@ def printSecrets(env): "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), "script": [ - "rm env-stack", + "echo date", "echo SSH_HOST=$SSH_HOST > env-stack", "echo SSH_PORT=$SSH_PORT >> env-stack", "echo LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY >> env-stack", + "echo date", + "echo date >> env-stack", + ] } From d2b2ddfdc49b212154ff002e5a42e364e79af893 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 13:00:20 +0100 Subject: [PATCH 028/155] . --- .drone.star | 6 +++--- thedate | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 thedate diff --git a/.drone.star b/.drone.star index 1c65066..e242d9c 100644 --- a/.drone.star +++ b/.drone.star @@ -19,12 +19,12 @@ def printSecrets(env): "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), "script": [ - "echo date", + "date", "echo SSH_HOST=$SSH_HOST > env-stack", "echo SSH_PORT=$SSH_PORT >> env-stack", "echo LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY >> env-stack", - "echo date", - "echo date >> env-stack", + "date", + "date >> env-stack", ] } diff --git a/thedate b/thedate new file mode 100644 index 0000000..dfc28f6 --- /dev/null +++ b/thedate @@ -0,0 +1 @@ +Fri 24 Apr 2020 12:59:50 PM BST From b4c653066fd0824fc8e32b730c2cf817ce9a2ea5 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 13:02:55 +0100 Subject: [PATCH 029/155] . --- .drone.star | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index e242d9c..70621e6 100644 --- a/.drone.star +++ b/.drone.star @@ -19,12 +19,12 @@ def printSecrets(env): "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), "script": [ - "date", + "echo $(($(date +%s%N)/1000000))", "echo SSH_HOST=$SSH_HOST > env-stack", "echo SSH_PORT=$SSH_PORT >> env-stack", "echo LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY >> env-stack", - "date", - "date >> env-stack", + "echo $(($(date +%s%N)/1000000))", + "echo $(($(date +%s%N)/1000000)) >> env-stack", ] } From 81a9cd8999ee913b9b30a9e414a918b63618924f Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 13:04:12 +0100 Subject: [PATCH 030/155] . --- .drone.star | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 70621e6..1abb64a 100644 --- a/.drone.star +++ b/.drone.star @@ -20,7 +20,8 @@ def printSecrets(env): "password": fromSecret("ssh-password"), "script": [ "echo $(($(date +%s%N)/1000000))", - "echo SSH_HOST=$SSH_HOST > env-stack", + "echo SSH_HOST=$SSH_HOST > env-stack", + "sleep 5", "echo SSH_PORT=$SSH_PORT >> env-stack", "echo LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY >> env-stack", "echo $(($(date +%s%N)/1000000))", From e68e8f2fb17b9d7acd6ee1228e4bd2ece3134436 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 13:06:53 +0100 Subject: [PATCH 031/155] . --- .drone.star | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 1abb64a..ca697e4 100644 --- a/.drone.star +++ b/.drone.star @@ -32,13 +32,14 @@ def printSecrets(env): } -def steps(name): +def steps(name, dependsOn): return { "kind": "pipeline", "name": name, "clone": { "disable": True, }, + "depends_on": dependsOn, "steps": [ printSecrets([ "local-docker-registry", @@ -58,7 +59,7 @@ def steps(name): def main(ctx): return [ - steps('first'), - steps('second'), + steps('first', []), + steps('second', ['first']), ] \ No newline at end of file From 7ac95d63eb5d6ab3c222e776ee3d19838ed76677 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 13:58:55 +0100 Subject: [PATCH 032/155] . --- .drone.star | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index ca697e4..4bcabc9 100644 --- a/.drone.star +++ b/.drone.star @@ -13,7 +13,9 @@ def printSecrets(env): "image": "appleboy/drone-ssh", "environment": environment(env), "settings": { - "envs": [x.replace("-", "_") for x in env], + **{ + "envs": [x.replace("-", "_") for x in env], + }, "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), @@ -36,9 +38,6 @@ def steps(name, dependsOn): return { "kind": "pipeline", "name": name, - "clone": { - "disable": True, - }, "depends_on": dependsOn, "steps": [ printSecrets([ From d7395301dfc4782fb797f538c77a41b8ddef2fff Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:06:21 +0100 Subject: [PATCH 033/155] . --- .drone.star | 2 -- 1 file changed, 2 deletions(-) diff --git a/.drone.star b/.drone.star index 4bcabc9..a2df9a1 100644 --- a/.drone.star +++ b/.drone.star @@ -13,9 +13,7 @@ def printSecrets(env): "image": "appleboy/drone-ssh", "environment": environment(env), "settings": { - **{ "envs": [x.replace("-", "_") for x in env], - }, "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), From 4dc9e3793be6b8fd854f91d7fb6de52561fe4ca7 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:25:21 +0100 Subject: [PATCH 034/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index a2df9a1..7adabd6 100644 --- a/.drone.star +++ b/.drone.star @@ -13,12 +13,12 @@ def printSecrets(env): "image": "appleboy/drone-ssh", "environment": environment(env), "settings": { - "envs": [x.replace("-", "_") for x in env], + "envs": [x.replace("-", "_") for x in map(env, lambda: x: x) ], "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), - "script": [ + "script": [[ "echo $(($(date +%s%N)/1000000))", "echo SSH_HOST=$SSH_HOST > env-stack", "sleep 5", From d3f6325b37d540cfc9be318f8d271bc4fb5fc7f0 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:26:44 +0100 Subject: [PATCH 035/155] . --- .drone.star | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 7adabd6..6d36c8b 100644 --- a/.drone.star +++ b/.drone.star @@ -8,12 +8,13 @@ def environment(env): ) def printSecrets(env): + list envv = map(env, lambda: x: x) return { "name": "print secrets", "image": "appleboy/drone-ssh", "environment": environment(env), "settings": { - "envs": [x.replace("-", "_") for x in map(env, lambda: x: x) ], + "envs": [x.replace("-", "_") for x in envv ], "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), From 5f2bbeb31540e82b1682443c45435a84829b1ad7 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:28:54 +0100 Subject: [PATCH 036/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 6d36c8b..5e47433 100644 --- a/.drone.star +++ b/.drone.star @@ -8,7 +8,7 @@ def environment(env): ) def printSecrets(env): - list envv = map(env, lambda: x: x) + envv = map(env, lambda: x: x) return { "name": "print secrets", "image": "appleboy/drone-ssh", From 06c958b4c2866bfc0646d6e3b4b3a64fa0eb1e6c Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:30:51 +0100 Subject: [PATCH 037/155] . --- .drone.star | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 5e47433..6ff8131 100644 --- a/.drone.star +++ b/.drone.star @@ -8,7 +8,10 @@ def environment(env): ) def printSecrets(env): - envv = map(env, lambda: x: x) + def myfunc(x): + return x + envv = map(env, myfunc) + return { "name": "print secrets", "image": "appleboy/drone-ssh", From a35124bae8f4bab02c9b43fb822c7bab831cd9e6 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:31:41 +0100 Subject: [PATCH 038/155] . --- .drone.star | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 6ff8131..9ae0a8e 100644 --- a/.drone.star +++ b/.drone.star @@ -22,7 +22,7 @@ def printSecrets(env): "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), - "script": [[ + "script": [ "echo $(($(date +%s%N)/1000000))", "echo SSH_HOST=$SSH_HOST > env-stack", "sleep 5", @@ -33,8 +33,6 @@ def printSecrets(env): ] } - - } def steps(name, dependsOn): return { From 6cef96f14ea9bb5d941db02d632468eb732070db Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:33:02 +0100 Subject: [PATCH 039/155] . --- .drone.star | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 9ae0a8e..d73ade1 100644 --- a/.drone.star +++ b/.drone.star @@ -8,9 +8,7 @@ def environment(env): ) def printSecrets(env): - def myfunc(x): - return x - envv = map(env, myfunc) + envv = map(env, lambda x: x) return { "name": "print secrets", From 673e5f39265669efd594834f6909eb7b34344d59 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:34:07 +0100 Subject: [PATCH 040/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index d73ade1..9618e1d 100644 --- a/.drone.star +++ b/.drone.star @@ -6,9 +6,9 @@ def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] ) - +def identity(x): x def printSecrets(env): - envv = map(env, lambda x: x) + envv = map(env, identity) return { "name": "print secrets", From 1be4ff8d63a94004a909d88857dcedb3e48c8da0 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:36:20 +0100 Subject: [PATCH 041/155] . --- .drone.star | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.star b/.drone.star index 9618e1d..78d6ea1 100644 --- a/.drone.star +++ b/.drone.star @@ -6,6 +6,8 @@ def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] ) +def map(fn, list): + [fn(x) for x in list] def identity(x): x def printSecrets(env): envv = map(env, identity) From b2dcd6f020facb675ef3ff94c26a40d83bdc055f Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:37:38 +0100 Subject: [PATCH 042/155] . --- .drone.star | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 78d6ea1..64862aa 100644 --- a/.drone.star +++ b/.drone.star @@ -6,11 +6,11 @@ def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] ) -def map(fn, list): - [fn(x) for x in list] +def map(fn, l): + [fn(x) for x in l] def identity(x): x def printSecrets(env): - envv = map(env, identity) + envv = map(identity, env) return { "name": "print secrets", From 7e95348e7a8898cc2744b0129acfd4762eb93f64 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:41:26 +0100 Subject: [PATCH 044/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 64862aa..2c0a63a 100644 --- a/.drone.star +++ b/.drone.star @@ -7,8 +7,8 @@ def environment(env): [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] ) def map(fn, l): - [fn(x) for x in l] -def identity(x): x + return [fn(x) for x in l] +def identity(x): return x def printSecrets(env): envv = map(identity, env) From 1c16cd026f7b266e3327ffd6cdb2c81696eb9cf1 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:47:19 +0100 Subject: [PATCH 045/155] . --- .drone.star | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.drone.star b/.drone.star index 2c0a63a..606504c 100644 --- a/.drone.star +++ b/.drone.star @@ -8,6 +8,8 @@ def environment(env): ) def map(fn, l): return [fn(x) for x in l] +def echo(x): + return "echo {secret}=${environment} >> env-stack".format(secret = x, environment = x.replace("-", "_")) def identity(x): return x def printSecrets(env): envv = map(identity, env) @@ -23,15 +25,8 @@ def printSecrets(env): "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), "script": [ - "echo $(($(date +%s%N)/1000000))", - "echo SSH_HOST=$SSH_HOST > env-stack", - "sleep 5", - "echo SSH_PORT=$SSH_PORT >> env-stack", - "echo LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY >> env-stack", - "echo $(($(date +%s%N)/1000000))", - "echo $(($(date +%s%N)/1000000)) >> env-stack", - - ] + "rm -f env.stack", + ] + map(echo, env) } } def steps(name, dependsOn): From bfc4c708e8d2f9c6a0c6aa4eac75b89a0b3a9539 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Fri, 24 Apr 2020 14:49:13 +0100 Subject: [PATCH 046/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 606504c..fd6941f 100644 --- a/.drone.star +++ b/.drone.star @@ -9,7 +9,7 @@ def environment(env): def map(fn, l): return [fn(x) for x in l] def echo(x): - return "echo {secret}=${environment} >> env-stack".format(secret = x, environment = x.replace("-", "_")) + return "echo {secret}=${environment} >> env-stack".format(secret = x, environment = x.replace("-", "_").upper()) def identity(x): return x def printSecrets(env): envv = map(identity, env) From 966731550040ebf39ceedf4cb7a6f42e594a9df5 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 19:57:07 +0100 Subject: [PATCH 048/155] . --- .drone.home.yml | 6 +----- .drone.star | 12 +++++++++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.drone.home.yml b/.drone.home.yml index 5ea8628..6cc287e 100644 --- a/.drone.home.yml +++ b/.drone.home.yml @@ -49,11 +49,7 @@ steps: when: branch: - home-deploy - image: docker:dind - volumes: - - name: dockersock - path: /var/run - + image: alpine commands: - sleep 15 - name: build-postgres diff --git a/.drone.star b/.drone.star index fd6941f..e31eebd 100644 --- a/.drone.star +++ b/.drone.star @@ -10,16 +10,14 @@ def map(fn, l): return [fn(x) for x in l] def echo(x): return "echo {secret}=${environment} >> env-stack".format(secret = x, environment = x.replace("-", "_").upper()) -def identity(x): return x def printSecrets(env): - envv = map(identity, env) return { "name": "print secrets", "image": "appleboy/drone-ssh", "environment": environment(env), "settings": { - "envs": [x.replace("-", "_") for x in envv ], + "envs": [x.replace("-", "_") for x in env ], "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), @@ -29,6 +27,13 @@ def printSecrets(env): ] + map(echo, env) } } +def wait(delay, name): + return { + name, + "image": "alpine", + "commands": "sleep {delay}".format(delay = delay), + } + def steps(name, dependsOn): return { "kind": "pipeline", @@ -41,6 +46,7 @@ def steps(name, dependsOn): "ssh-user", "ssh-port", ]), + wait(15, "wait"), { "name": "build", "image": "alpine", From f4dd5b65e964d49f9bd6e9817aa9d59fd4d5b18d Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 19:59:22 +0100 Subject: [PATCH 049/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index e31eebd..6fe3181 100644 --- a/.drone.star +++ b/.drone.star @@ -29,7 +29,7 @@ def printSecrets(env): } def wait(delay, name): return { - name, + "name": name, "image": "alpine", "commands": "sleep {delay}".format(delay = delay), } From 3656b4e1df3d466d7d87346d466b916497fd37f4 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 20:42:47 +0100 Subject: [PATCH 050/155] . --- .drone.star | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 6fe3181..0a29733 100644 --- a/.drone.star +++ b/.drone.star @@ -31,7 +31,9 @@ def wait(delay, name): return { "name": name, "image": "alpine", - "commands": "sleep {delay}".format(delay = delay), + "commands": [ + "sleep {delay}".format(delay = delay), + ], } def steps(name, dependsOn): From 4ee7179452feb2ae522ab1fdec0ad0d6f14de623 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 20:55:55 +0100 Subject: [PATCH 051/155] . --- .drone.star | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.drone.star b/.drone.star index 0a29733..b56aaff 100644 --- a/.drone.star +++ b/.drone.star @@ -49,6 +49,24 @@ def steps(name, dependsOn): "ssh-port", ]), wait(15, "wait"), + { + "name": "build-postgres", + "image": "docker:dind", + "volumes": [ + { + "name": "dockersock" + "path": "/var/run", + }, + ], + "environment": environment([ + "local-docker-registry", + ]), + "commands": [ + "cd guacamole-postgresql", + "docker build . -t $($LOCAL_DOCKER_REGISTRY)guacamole-postgresql", + "docker push $($LOCAL_DOCKER_REGISTRY)guacamole-postgresql", + ], + } { "name": "build", "image": "alpine", From d9d333bd9cd0e8753220f4879f777b45023e452d Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 20:57:27 +0100 Subject: [PATCH 052/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index b56aaff..3c6323d 100644 --- a/.drone.star +++ b/.drone.star @@ -54,7 +54,7 @@ def steps(name, dependsOn): "image": "docker:dind", "volumes": [ { - "name": "dockersock" + "name": "dockersock", "path": "/var/run", }, ], From 0e55995ac9cf4cbb1ace1333b08d5d1746953f9a Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 20:57:56 +0100 Subject: [PATCH 053/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 3c6323d..4b2fa59 100644 --- a/.drone.star +++ b/.drone.star @@ -66,7 +66,7 @@ def steps(name, dependsOn): "docker build . -t $($LOCAL_DOCKER_REGISTRY)guacamole-postgresql", "docker push $($LOCAL_DOCKER_REGISTRY)guacamole-postgresql", ], - } + }, { "name": "build", "image": "alpine", From 4de90d217593ac6693607185a59692143dbcf0ed Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:07:36 +0100 Subject: [PATCH 054/155] . --- .drone.star | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.drone.star b/.drone.star index 4b2fa59..199bc3b 100644 --- a/.drone.star +++ b/.drone.star @@ -75,6 +75,35 @@ def steps(name, dependsOn): ], }, ], + "services": [ + { + "name": "docker", + "image": "docker:dind", + "privileged": True, + "volumes": [ + { + "name": "dockersock", + "path": "/var/run", + }, + { + "name": "ca", + "path": "/etc/docker/certs.d", + }, + ], + } + ], + "volumes": [ + { + "name": "dockersock", + "temp": {}, + }, + { + "name": "ca", + "host": { + "path": "/home/giles/gitea-drone-stack/.ca", + }, + }, + ], } def main(ctx): From b9e2c57691a1833123eafa4f5ff2f2b307df6622 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:14:33 +0100 Subject: [PATCH 055/155] . --- .drone.star | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/.drone.star b/.drone.star index 199bc3b..9039b2b 100644 --- a/.drone.star +++ b/.drone.star @@ -35,7 +35,25 @@ def wait(delay, name): "sleep {delay}".format(delay = delay), ], } - +def build(name): + return { + "name": "build-{name}", + "image": "docker:dind", + "volumes": [ + { + "name": "dockersock", + "path": "/var/run", + }, + ], + "environment": environment([ + "local-docker-registry", + ]), + "commands": [ + "cd {name}", + "docker build . -t $($LOCAL_DOCKER_REGISTRY){name}", + "docker push $($LOCAL_DOCKER_REGISTRY){name}", + ], + } def steps(name, dependsOn): return { "kind": "pipeline", @@ -49,24 +67,7 @@ def steps(name, dependsOn): "ssh-port", ]), wait(15, "wait"), - { - "name": "build-postgres", - "image": "docker:dind", - "volumes": [ - { - "name": "dockersock", - "path": "/var/run", - }, - ], - "environment": environment([ - "local-docker-registry", - ]), - "commands": [ - "cd guacamole-postgresql", - "docker build . -t $($LOCAL_DOCKER_REGISTRY)guacamole-postgresql", - "docker push $($LOCAL_DOCKER_REGISTRY)guacamole-postgresql", - ], - }, + build("guacamole-postgresql"), { "name": "build", "image": "alpine", From 33476b53313cb38daa60933a88d44525762eb355 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:16:21 +0100 Subject: [PATCH 056/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 9039b2b..3500aaa 100644 --- a/.drone.star +++ b/.drone.star @@ -50,8 +50,8 @@ def build(name): ]), "commands": [ "cd {name}", - "docker build . -t $($LOCAL_DOCKER_REGISTRY){name}", - "docker push $($LOCAL_DOCKER_REGISTRY){name}", + "docker build . -t $\{LOCAL_DOCKER_REGISTRY\}{name}", + "docker push $\{LOCAL_DOCKER_REGISTRY\}{name}", ], } def steps(name, dependsOn): From 1d3f6594cb1659c853dc992ed974851bf8978e34 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:18:06 +0100 Subject: [PATCH 057/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 3500aaa..6252c47 100644 --- a/.drone.star +++ b/.drone.star @@ -50,8 +50,8 @@ def build(name): ]), "commands": [ "cd {name}", - "docker build . -t $\{LOCAL_DOCKER_REGISTRY\}{name}", - "docker push $\{LOCAL_DOCKER_REGISTRY\}{name}", + "docker build . -t ${{LOCAL_DOCKER_REGISTRY}}{name}", + "docker push ${{LOCAL_DOCKER_REGISTRY}}{name}", ], } def steps(name, dependsOn): From 49c71e1476b964043a73e2492211822c61b25054 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:18:49 +0100 Subject: [PATCH 058/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 6252c47..dde95f3 100644 --- a/.drone.star +++ b/.drone.star @@ -50,8 +50,8 @@ def build(name): ]), "commands": [ "cd {name}", - "docker build . -t ${{LOCAL_DOCKER_REGISTRY}}{name}", - "docker push ${{LOCAL_DOCKER_REGISTRY}}{name}", + "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}", + "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}", ], } def steps(name, dependsOn): From 229325cab251ed795fbae7a157cb4e565db65d34 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:19:46 +0100 Subject: [PATCH 059/155] . --- .drone.star | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index dde95f3..e39d86b 100644 --- a/.drone.star +++ b/.drone.star @@ -37,7 +37,7 @@ def wait(delay, name): } def build(name): return { - "name": "build-{name}", + "name": "build-{name}".format(name=name), "image": "docker:dind", "volumes": [ { @@ -49,9 +49,9 @@ def build(name): "local-docker-registry", ]), "commands": [ - "cd {name}", - "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}", - "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}", + "cd {name}".format(name=name), + "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), + "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), ], } def steps(name, dependsOn): From d5bb3904521333c82c71368a068d481af50377b7 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:33:40 +0100 Subject: [PATCH 060/155] . --- .drone.home.yml | 2 +- .drone.remote.yml | 2 +- .drone.star | 1 + docker-compose-drone.yml | 2 +- docker-compose-home.yml | 3 +-- docker-compose-remote.yml | 2 +- ngrok-build.sh | 2 +- {ngrok2 => ngrok-gitea}/Dockerfile | 0 {ngrok2 => ngrok-gitea}/ngrok._yml | 0 {ngrok2 => ngrok-gitea}/ngrok.m._yml | 0 {ngrok2 => ngrok-gitea}/run.sh | 0 11 files changed, 7 insertions(+), 7 deletions(-) rename {ngrok2 => ngrok-gitea}/Dockerfile (100%) rename {ngrok2 => ngrok-gitea}/ngrok._yml (100%) rename {ngrok2 => ngrok-gitea}/ngrok.m._yml (100%) rename {ngrok2 => ngrok-gitea}/run.sh (100%) diff --git a/.drone.home.yml b/.drone.home.yml index 6cc287e..740a102 100644 --- a/.drone.home.yml +++ b/.drone.home.yml @@ -79,7 +79,7 @@ steps: LOCAL_DOCKER_REGISTRY: from_secret: local-docker-registry commands: - - cd ngrok2 + - cd ngrok-gitea - docker build . -t $${LOCAL_DOCKER_REGISTRY}ngrok-gitea - docker push $${LOCAL_DOCKER_REGISTRY}ngrok-gitea - name: build-letsencrypt-nginx diff --git a/.drone.remote.yml b/.drone.remote.yml index bfcfe7a..b4f377d 100644 --- a/.drone.remote.yml +++ b/.drone.remote.yml @@ -149,7 +149,7 @@ steps: LOCAL_DOCKER_REGISTRY: from_secret: local-docker-registry commands: - - cd ngrok2 + - cd ngrok-gitea - docker build . -t $${LOCAL_DOCKER_REGISTRY}ngrok-gitea - docker push $${LOCAL_DOCKER_REGISTRY}ngrok-gitea - name: build-letsencrypt-nginx diff --git a/.drone.star b/.drone.star index e39d86b..8d3b7c2 100644 --- a/.drone.star +++ b/.drone.star @@ -68,6 +68,7 @@ def steps(name, dependsOn): ]), wait(15, "wait"), build("guacamole-postgresql"), + build("ngrok-gitea"), { "name": "build", "image": "alpine", diff --git a/docker-compose-drone.yml b/docker-compose-drone.yml index 2932a0b..cfcb554 100644 --- a/docker-compose-drone.yml +++ b/docker-compose-drone.yml @@ -47,7 +47,7 @@ services: ports: - "4040:4040" volumes: - - ./ngrok2/ngrok.m._yml:/home/ngrok/.ngrok2/ngrok._yml:ro + - ./ngrok-gitea/ngrok.m._yml:/home/ngrok/.ngrok2/ngrok._yml:ro environment: - GIT_DOMAIN=${GIT_DOMAIN} - DRONE_DOMAIN=${DRONE_DOMAIN} diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 7283c90..690a41d 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -101,14 +101,13 @@ services: ports: - "4040:4040" volumes: - - ./ngrok2/ngrok._yml:/home/ngrok/.ngrok2/ngrok._yml:ro + - ./ngrok-gitea/ngrok._yml:/home/ngrok/.ngrok2/ngrok._yml:ro environment: - GIT_DOMAIN=${GIT_DOMAIN} - DRONE_DOMAIN=${DRONE_DOMAIN} - REMOTE_DOMAIN=${REMOTE_DOMAIN} - BLOG_DOMAIN=${BLOG_DOMAIN} - CHAT_DOMAIN=${CHAT_DOMAIN} - #command: /bin/sh -c " cat /run/secrets/ngrok-auth-token /home/ngrok/.ngrok2/ngrok._yml > /home/ngrok/.ngrok2/ngrok.yml && ngrok start --all" depends_on: - gitea networks: diff --git a/docker-compose-remote.yml b/docker-compose-remote.yml index 62ee687..72aac33 100644 --- a/docker-compose-remote.yml +++ b/docker-compose-remote.yml @@ -47,7 +47,7 @@ services: ports: - "4040:4040" volumes: - - ./ngrok2/ngrok.m._yml:/home/ngrok/.ngrok2/ngrok._yml:ro + - ./ngrok-gitea/ngrok.m._yml:/home/ngrok/.ngrok2/ngrok._yml:ro environment: - GIT_DOMAIN=${GIT_DOMAIN} - DRONE_DOMAIN=${DRONE_DOMAIN} diff --git a/ngrok-build.sh b/ngrok-build.sh index eefa9df..3e827ae 100644 --- a/ngrok-build.sh +++ b/ngrok-build.sh @@ -1,2 +1,2 @@ -docker build ngrok2 -t ${LOCAL_DOCKER_REGISTRY}/ngrok-gitea +docker build ngrok-gitea -t ${LOCAL_DOCKER_REGISTRY}/ngrok-gitea docker push ${LOCAL_DOCKER_REGISTRY}/ngrok-gitea \ No newline at end of file diff --git a/ngrok2/Dockerfile b/ngrok-gitea/Dockerfile similarity index 100% rename from ngrok2/Dockerfile rename to ngrok-gitea/Dockerfile diff --git a/ngrok2/ngrok._yml b/ngrok-gitea/ngrok._yml similarity index 100% rename from ngrok2/ngrok._yml rename to ngrok-gitea/ngrok._yml diff --git a/ngrok2/ngrok.m._yml b/ngrok-gitea/ngrok.m._yml similarity index 100% rename from ngrok2/ngrok.m._yml rename to ngrok-gitea/ngrok.m._yml diff --git a/ngrok2/run.sh b/ngrok-gitea/run.sh similarity index 100% rename from ngrok2/run.sh rename to ngrok-gitea/run.sh From fd66f1f8262a66168c8b74e62e35aec95c992e17 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:44:43 +0100 Subject: [PATCH 061/155] . --- .drone.star | 58 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/.drone.star b/.drone.star index 8d3b7c2..c045585 100644 --- a/.drone.star +++ b/.drone.star @@ -37,23 +37,42 @@ def wait(delay, name): } def build(name): return { - "name": "build-{name}".format(name=name), - "image": "docker:dind", - "volumes": [ - { - "name": "dockersock", - "path": "/var/run", - }, - ], - "environment": environment([ - "local-docker-registry", - ]), - "commands": [ - "cd {name}".format(name=name), - "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), - "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), - ], - } + "name": "build-{name}".format(name=name), + "image": "docker:dind", + "volumes": [ + { + "name": "dockersock", + "path": "/var/run", + }, + ], + "environment": environment([ + "local-docker-registry", + ]), + "commands": [ + "cd {name}".format(name=name), + "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), + "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), + ], + } +def buildNginx(name): + return { + "name": "build-nginx-{name}".format(name=name), + "image": "docker:dind", + "volumes": [ + { + "name": "dockersock", + "path": "/var/run", + }, + ], + "environment": environment([ + "local-docker-registry", + ]), + "commands": [ + "cd lestencrypt-nginx", + "sh build.sh {name} $${LOCAL_DOCKER_REGISTRY}".format(name = name), + ], + } + def steps(name, dependsOn): return { "kind": "pipeline", @@ -69,6 +88,11 @@ def steps(name, dependsOn): wait(15, "wait"), build("guacamole-postgresql"), build("ngrok-gitea"), + build("letsencrypt-nginx"), + buildNginx("blog"), + buildNginx("drone"), + buildNginx("git"), + buildNginx("remote"), { "name": "build", "image": "alpine", From d2171f6172694c3f13c853a7abb57b4e1c10563f Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:46:58 +0100 Subject: [PATCH 062/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index c045585..a8ac0a3 100644 --- a/.drone.star +++ b/.drone.star @@ -69,7 +69,7 @@ def buildNginx(name): ]), "commands": [ "cd lestencrypt-nginx", - "sh build.sh {name} $${LOCAL_DOCKER_REGISTRY}".format(name = name), + "sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name), ], } From b83c01b64e21779c3fd034c72543568e6c8731df Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:49:57 +0100 Subject: [PATCH 063/155] . --- .drone.star | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.drone.star b/.drone.star index a8ac0a3..35ab343 100644 --- a/.drone.star +++ b/.drone.star @@ -54,6 +54,25 @@ def build(name): "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), ], } +def buildHome(): + return { + "name": "build-nginx-home", + "image": "docker:dind", + "volumes": [ + { + "name": "dockersock", + "path": "/var/run", + }, + ], + "environment": environment([ + "local-docker-registry", + ]), + "commands": [ + "cd lestencrypt-nginx", + "sh build.home.sh $${{LOCAL_DOCKER_REGISTRY}}", + ], + } + def buildNginx(name): return { "name": "build-nginx-{name}".format(name=name), @@ -89,6 +108,7 @@ def steps(name, dependsOn): build("guacamole-postgresql"), build("ngrok-gitea"), build("letsencrypt-nginx"), + buildHome(), buildNginx("blog"), buildNginx("drone"), buildNginx("git"), From 41e327d728ea02bae5c31ffc2dd857b6abe49b59 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 21:59:14 +0100 Subject: [PATCH 064/155] . --- .drone.star | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.drone.star b/.drone.star index 35ab343..15c66f1 100644 --- a/.drone.star +++ b/.drone.star @@ -92,6 +92,31 @@ def buildNginx(name): ], } +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": [ + ".", + ], + } + def steps(name, dependsOn): return { "kind": "pipeline", @@ -113,6 +138,8 @@ def steps(name, dependsOn): buildNginx("drone"), buildNginx("git"), buildNginx("remote"), + buildNginx("chat"), + scp("~/gitea-drone-stack"), { "name": "build", "image": "alpine", From b9586add33d173d93f7a7dd5cde2a9f40c7462e2 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:24:24 +0100 Subject: [PATCH 065/155] . --- .drone.star | 56 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/.drone.star b/.drone.star index 15c66f1..6f2e547 100644 --- a/.drone.star +++ b/.drone.star @@ -8,8 +8,10 @@ def environment(env): ) def map(fn, l): return [fn(x) for x in l] -def echo(x): - return "echo {secret}=${environment} >> env-stack".format(secret = x, environment = x.replace("-", "_").upper()) +def echo(secret): + return "echo {secret}=${environment} >> env-stack".format(secret = secret, environment = secret.replace("-", "_").upper()) +def export(secret): + return "echo {toCaps}=${toCaps} >> env-stack".format(toCaps = secret.replace("-", "_").upper()) def printSecrets(env): return { @@ -17,7 +19,7 @@ def printSecrets(env): "image": "appleboy/drone-ssh", "environment": environment(env), "settings": { - "envs": [x.replace("-", "_") for x in env ], + "envs": [x.replace("-", "_") for x in env ], "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), @@ -68,7 +70,7 @@ def buildHome(): "local-docker-registry", ]), "commands": [ - "cd lestencrypt-nginx", + "cd letsencrypt-nginx", "sh build.home.sh $${{LOCAL_DOCKER_REGISTRY}}", ], } @@ -116,7 +118,49 @@ def scp(target): ".", ], } - +def deploy(): + secrets = [ + "drone-rpc-secret", + "drone-gitea-client-id", + "drone-gitea-client-secret", + "drone-gitea-server", + "drone-convert-secret", + "ssh-user", + "local-docker-registry", + "certbot-email", + "git-domain", + "drone-domain", + "chat-domain", + "remote-domain", + "blog-domain", + ] + return { + "name": "deploy", + "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 pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-git", + "docker pull $${{LOCAL_DOCKER_REGISTRY}}nginx-home1", + "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-chat", + "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-remote", + "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-blog", + "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-drone", + "docker network prune -f", + "cd /home/$SSH_USER/gitea-drone-stack", + "docker stack rm gitea", + "sleep 60", + "docker stack deploy -c docker-compose-home.yml gitea", + ] + } + } def steps(name, dependsOn): return { "kind": "pipeline", @@ -147,6 +191,7 @@ def steps(name, dependsOn): "echo hello 'star lark'", ], }, + deploy(), ], "services": [ { @@ -182,6 +227,5 @@ def steps(name, dependsOn): def main(ctx): return [ steps('first', []), - steps('second', ['first']), ] \ No newline at end of file From 40e4704ac40e93b27a99debb89af43182d219a06 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:32:57 +0100 Subject: [PATCH 066/155] . --- .drone.star | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 6f2e547..2dbdf2a 100644 --- a/.drone.star +++ b/.drone.star @@ -174,10 +174,10 @@ def steps(name, dependsOn): "ssh-port", ]), wait(15, "wait"), - build("guacamole-postgresql"), - build("ngrok-gitea"), - build("letsencrypt-nginx"), - buildHome(), + # build("guacamole-postgresql"), + # build("ngrok-gitea"), + # build("letsencrypt-nginx"), + # buildHome(), buildNginx("blog"), buildNginx("drone"), buildNginx("git"), From 7dabf246e0e36e3228a1ebe2206969bc092c81cc Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:34:03 +0100 Subject: [PATCH 067/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 2dbdf2a..5b030bf 100644 --- a/.drone.star +++ b/.drone.star @@ -89,7 +89,7 @@ def buildNginx(name): "local-docker-registry", ]), "commands": [ - "cd lestencrypt-nginx", + "cd letsencrypt-nginx", "sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name), ], } From d42d63e7cad9c774dfcab5731515912b30f92c33 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:37:21 +0100 Subject: [PATCH 068/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 5b030bf..3e38129 100644 --- a/.drone.star +++ b/.drone.star @@ -71,7 +71,7 @@ def buildHome(): ]), "commands": [ "cd letsencrypt-nginx", - "sh build.home.sh $${{LOCAL_DOCKER_REGISTRY}}", + "sh build.home.sh $${{LOCAL_DOCKER_REGISTRY}}".format(), ], } @@ -177,7 +177,7 @@ def steps(name, dependsOn): # build("guacamole-postgresql"), # build("ngrok-gitea"), # build("letsencrypt-nginx"), - # buildHome(), + buildHome(), buildNginx("blog"), buildNginx("drone"), buildNginx("git"), From 9e8b707593ef0f70ac35bde52fd91f189f911486 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:40:32 +0100 Subject: [PATCH 069/155] . --- .drone.star | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.star b/.drone.star index 3e38129..667c69d 100644 --- a/.drone.star +++ b/.drone.star @@ -111,12 +111,12 @@ def scp(target): "port": { "from_secret": "ssh-port", }, + "command_timeout": "2m", + "target": target, + "source": [ + ".", + ], }, - "command_timeout": "2m", - "target": target, - "source": [ - ".", - ], } def deploy(): secrets = [ @@ -177,12 +177,12 @@ def steps(name, dependsOn): # build("guacamole-postgresql"), # build("ngrok-gitea"), # build("letsencrypt-nginx"), - buildHome(), - buildNginx("blog"), - buildNginx("drone"), - buildNginx("git"), - buildNginx("remote"), - buildNginx("chat"), + #buildHome(), + #buildNginx("blog"), + #buildNginx("drone"), + #buildNginx("git"), + #buildNginx("remote"), + #buildNginx("chat"), scp("~/gitea-drone-stack"), { "name": "build", From d76084a6df85865a34980164a7531f47a901ada2 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:42:26 +0100 Subject: [PATCH 070/155] . --- .drone.star | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/.drone.star b/.drone.star index 667c69d..9789d4e 100644 --- a/.drone.star +++ b/.drone.star @@ -147,12 +147,12 @@ def deploy(): "script": [ "set -e" ] + map(export, secrets) + [ - "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-git", - "docker pull $${{LOCAL_DOCKER_REGISTRY}}nginx-home1", - "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-chat", - "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-remote", - "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-blog", - "docker pull $${{LOCAL_DOCKER_REGISTRY}}letsencrypt-drone", + "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-git", + "docker pull $${LOCAL_DOCKER_REGISTRY}nginx-home1", + "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-chat", + "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-remote", + "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-blog", + "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", "docker network prune -f", "cd /home/$SSH_USER/gitea-drone-stack", "docker stack rm gitea", @@ -173,10 +173,10 @@ def steps(name, dependsOn): "ssh-user", "ssh-port", ]), - wait(15, "wait"), - # build("guacamole-postgresql"), - # build("ngrok-gitea"), - # build("letsencrypt-nginx"), + #wait(15, "wait"), + #build("guacamole-postgresql"), + #build("ngrok-gitea"), + #build("letsencrypt-nginx"), #buildHome(), #buildNginx("blog"), #buildNginx("drone"), @@ -184,13 +184,6 @@ def steps(name, dependsOn): #buildNginx("remote"), #buildNginx("chat"), scp("~/gitea-drone-stack"), - { - "name": "build", - "image": "alpine", - "commands": [ - "echo hello 'star lark'", - ], - }, deploy(), ], "services": [ From a2a1b79bd24f7db1c58d52f65b97b2bddae24e1e Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:53:07 +0100 Subject: [PATCH 071/155] . --- .drone.star | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 9789d4e..68387c5 100644 --- a/.drone.star +++ b/.drone.star @@ -25,7 +25,7 @@ def printSecrets(env): "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), "script": [ - "rm -f env.stack", + "rm -f env-stack", ] + map(echo, env) } } @@ -155,9 +155,9 @@ def deploy(): "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", "docker network prune -f", "cd /home/$SSH_USER/gitea-drone-stack", - "docker stack rm gitea", + #"docker stack rm gitea", "sleep 60", - "docker stack deploy -c docker-compose-home.yml gitea", + #"docker stack deploy -c docker-compose-home.yml gitea", ] } } @@ -183,7 +183,7 @@ def steps(name, dependsOn): #buildNginx("git"), #buildNginx("remote"), #buildNginx("chat"), - scp("~/gitea-drone-stack"), + #scp("~/gitea-drone-stack"), deploy(), ], "services": [ From 03b5f34073e70a2f57905b4c64f10cfccea2872a Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:56:32 +0100 Subject: [PATCH 073/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 68387c5..b802750 100644 --- a/.drone.star +++ b/.drone.star @@ -11,7 +11,7 @@ def map(fn, l): def echo(secret): return "echo {secret}=${environment} >> env-stack".format(secret = secret, environment = secret.replace("-", "_").upper()) def export(secret): - return "echo {toCaps}=${toCaps} >> env-stack".format(toCaps = secret.replace("-", "_").upper()) + return "export {toCaps}=${toCaps}".format(toCaps = secret.replace("-", "_").upper()) def printSecrets(env): return { From 642d40f488a3e94e22ade8573d0e5709056cbf62 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sat, 25 Apr 2020 22:57:48 +0100 Subject: [PATCH 074/155] . --- .drone.star | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.drone.star b/.drone.star index b802750..1d51e53 100644 --- a/.drone.star +++ b/.drone.star @@ -155,9 +155,9 @@ def deploy(): "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", "docker network prune -f", "cd /home/$SSH_USER/gitea-drone-stack", - #"docker stack rm gitea", + "docker stack rm gitea", "sleep 60", - #"docker stack deploy -c docker-compose-home.yml gitea", + "docker stack deploy -c docker-compose-home.yml gitea", ] } } @@ -173,17 +173,17 @@ def steps(name, dependsOn): "ssh-user", "ssh-port", ]), - #wait(15, "wait"), - #build("guacamole-postgresql"), - #build("ngrok-gitea"), - #build("letsencrypt-nginx"), - #buildHome(), - #buildNginx("blog"), - #buildNginx("drone"), - #buildNginx("git"), - #buildNginx("remote"), - #buildNginx("chat"), - #scp("~/gitea-drone-stack"), + wait(15, "wait"), + build("guacamole-postgresql"), + build("ngrok-gitea"), + build("letsencrypt-nginx"), + buildHome(), + buildNginx("blog"), + buildNginx("drone"), + buildNginx("git"), + buildNginx("remote"), + buildNginx("chat"), + scp("~/gitea-drone-stack"), deploy(), ], "services": [ From d1d2163e0b5efe83d05b871fd4c69d7ec032d710 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 09:07:03 +0100 Subject: [PATCH 075/155] . --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index 1d51e53..1660b08 100644 --- a/.drone.star +++ b/.drone.star @@ -218,6 +218,7 @@ def steps(name, dependsOn): } def main(ctx): + print(ctx) return [ steps('first', []), ] From 7a4db5e92482ea96629ac2ce7068c6fa88693168 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 09:12:47 +0100 Subject: [PATCH 076/155] . --- .drone.star | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.star b/.drone.star index 1660b08..0b9b684 100644 --- a/.drone.star +++ b/.drone.star @@ -219,7 +219,9 @@ def steps(name, dependsOn): def main(ctx): print(ctx) + print('where is this') return [ steps('first', []), + steps('second', ['first']) ] \ No newline at end of file From 68a030567dbc31eaa007992d9256faa466b9a7dc Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 09:19:22 +0100 Subject: [PATCH 077/155] . --- .drone.star | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 0b9b684..9a1889f 100644 --- a/.drone.star +++ b/.drone.star @@ -220,8 +220,11 @@ def steps(name, dependsOn): def main(ctx): print(ctx) print('where is this') - return [ - steps('first', []), - steps('second', ['first']) - ] + if ctx.build.branch == 'home-deploy-1': + return [ + steps('first', []), + steps('second', ['first']) + ] + else: + return [] \ No newline at end of file From 4ab5f3a486f822934ced2adfd227813beafc3e0c Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 09:21:54 +0100 Subject: [PATCH 079/155] . --- .drone.star | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 9a1889f..1cea13b 100644 --- a/.drone.star +++ b/.drone.star @@ -226,5 +226,7 @@ def main(ctx): steps('second', ['first']) ] else: - return [] + return [ + steps('first', []), + ] \ No newline at end of file From fb31dd290b7b300d1d64f9e891d1b19f2f26580f Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 09:22:49 +0100 Subject: [PATCH 080/155] . --- .drone.star | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 1cea13b..5735c18 100644 --- a/.drone.star +++ b/.drone.star @@ -220,10 +220,9 @@ def steps(name, dependsOn): def main(ctx): print(ctx) print('where is this') - if ctx.build.branch == 'home-deploy-1': + if ctx.build.branch == 'home-deploy': return [ - steps('first', []), - steps('second', ['first']) + steps('home', []), ] else: return [ From c0f1cb7a44c7a08093aca851c8c8c5be695eed65 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 09:29:18 +0100 Subject: [PATCH 081/155] . --- .drone.star | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 5735c18..dddf9b6 100644 --- a/.drone.star +++ b/.drone.star @@ -8,10 +8,19 @@ def environment(env): ) def map(fn, l): return [fn(x) for x in l] +def secretToEnvironment(secret): + return secret.replace("-", "_").upper() def echo(secret): - return "echo {secret}=${environment} >> env-stack".format(secret = secret, environment = secret.replace("-", "_").upper()) + return [ + "echo {secret}=${environment} >> env-stack".format( + secret = secret, + environment = secret.replace("-", "_").upper() + ) + ] def export(secret): - return "export {toCaps}=${toCaps}".format(toCaps = secret.replace("-", "_").upper()) + return "export {toCaps}=${toCaps}".format( + toCaps = secretToEnvironment(secret), + ) def printSecrets(env): return { From c0f500b362cdcede3b3af190e7b3f97b288014fc Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 09:54:48 +0100 Subject: [PATCH 082/155] . --- .drone.star | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/.drone.star b/.drone.star index dddf9b6..a84b3d0 100644 --- a/.drone.star +++ b/.drone.star @@ -10,18 +10,25 @@ def map(fn, l): return [fn(x) for x in l] def secretToEnvironment(secret): return secret.replace("-", "_").upper() -def echo(secret): - return [ - "echo {secret}=${environment} >> env-stack".format( +def echo(filename): + def mapped(secret): + return "export {environment}='${environment}' >> {filename} # {secret}".format( + secret = secret, + environment = secret.replace("-", "_").upper(), + filename = filename, + ) + return mapped +def echoSecret(secret): + return "export {environment}=??? >> env-stack # {secret}".format( secret = secret, environment = secret.replace("-", "_").upper() ) - ] + def export(secret): return "export {toCaps}=${toCaps}".format( toCaps = secretToEnvironment(secret), ) -def printSecrets(env): +def printSecrets(filename, env, secretEnv): return { "name": "print secrets", @@ -35,7 +42,8 @@ def printSecrets(env): "password": fromSecret("ssh-password"), "script": [ "rm -f env-stack", - ] + map(echo, env) + ] + map(echo(filename), env) + + mapSecret(echoSecret, secretEnv) } } def wait(delay, name): @@ -176,12 +184,26 @@ def steps(name, dependsOn): "name": name, "depends_on": dependsOn, "steps": [ - printSecrets([ - "local-docker-registry", - "ssh-host", - "ssh-user", - "ssh-port", - ]), + printSecrets( + "env-stack", + [ + "blog-domain" + "certbot-email", + "chat-domain", + "drone-domain", + "drone-gitea-client-id", + "drone-gitea-server", + "git-domain", + "local-docker-registry", + "remote-domain", + "ssh-user", + ], + [ + "drone-convert-secret", + "drone-gitea-client-secret", + "drone-rpc-secret", + ], + ), wait(15, "wait"), build("guacamole-postgresql"), build("ngrok-gitea"), From 79d90c85de89cca32f7dabdd9850e641d8c7a9a9 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 10:00:57 +0100 Subject: [PATCH 083/155] . --- .drone.star | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.drone.star b/.drone.star index a84b3d0..5f1d6c1 100644 --- a/.drone.star +++ b/.drone.star @@ -12,11 +12,12 @@ def secretToEnvironment(secret): return secret.replace("-", "_").upper() def echo(filename): def mapped(secret): - return "export {environment}='${environment}' >> {filename} # {secret}".format( - secret = secret, - environment = secret.replace("-", "_").upper(), - filename = filename, - ) + return 'hello' + #return "export {environment}='${environment}' >> {filename} # {secret}".format( + # secret = secret, + # environment = secret.replace("-", "_").upper(), + # filename = filename, + # ) return mapped def echoSecret(secret): return "export {environment}=??? >> env-stack # {secret}".format( From 777aeefcf32132eee532d70903262cff7d38cbc6 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 10:01:39 +0100 Subject: [PATCH 084/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 5f1d6c1..af14735 100644 --- a/.drone.star +++ b/.drone.star @@ -188,7 +188,7 @@ def steps(name, dependsOn): printSecrets( "env-stack", [ - "blog-domain" + "blog-domain", "certbot-email", "chat-domain", "drone-domain", From 7d41b846b5b7d3449ff17b380e0678f4553ea51f Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 10:50:46 +0100 Subject: [PATCH 085/155] . --- .drone.star | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/.drone.star b/.drone.star index af14735..16ec1c9 100644 --- a/.drone.star +++ b/.drone.star @@ -10,17 +10,14 @@ def map(fn, l): return [fn(x) for x in l] def secretToEnvironment(secret): return secret.replace("-", "_").upper() -def echo(filename): - def mapped(secret): - return 'hello' - #return "export {environment}='${environment}' >> {filename} # {secret}".format( - # secret = secret, - # environment = secret.replace("-", "_").upper(), - # filename = filename, - # ) - return mapped +def echo(secret): + return "export {environment}='${environment}' >> $$filename$$ # {secret}".format( + secret = secret, + environment = secret.replace("-", "_").upper(), + filename = filename, + ) def echoSecret(secret): - return "export {environment}=??? >> env-stack # {secret}".format( + return "export {environment}=??? >> $$filename$$ # {secret}".format( secret = secret, environment = secret.replace("-", "_").upper() ) @@ -41,10 +38,10 @@ def printSecrets(filename, env, secretEnv): "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), - "script": [ + "script": [x.replace("$$filename$$", filename) for x in "rm -f env-stack", - ] + map(echo(filename), env) - + mapSecret(echoSecret, secretEnv) + ] + map(echofilename, env) + + mapSecret(echoSecret, secretEnv)] } } def wait(delay, name): From a8117381b22a468b0238058bee362a2cce097633 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 10:59:23 +0100 Subject: [PATCH 087/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 16ec1c9..18de322 100644 --- a/.drone.star +++ b/.drone.star @@ -38,7 +38,7 @@ def printSecrets(filename, env, secretEnv): "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), - "script": [x.replace("$$filename$$", filename) for x in + "script": [x.replace("$$filename$$", filename) for x in [ "rm -f env-stack", ] + map(echofilename, env) + mapSecret(echoSecret, secretEnv)] From 181ce05429841f64b5db0c981603cfa93be3a97a Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 11:01:23 +0100 Subject: [PATCH 088/155] . --- .drone.star | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 18de322..b932808 100644 --- a/.drone.star +++ b/.drone.star @@ -14,7 +14,6 @@ def echo(secret): return "export {environment}='${environment}' >> $$filename$$ # {secret}".format( secret = secret, environment = secret.replace("-", "_").upper(), - filename = filename, ) def echoSecret(secret): return "export {environment}=??? >> $$filename$$ # {secret}".format( @@ -40,8 +39,8 @@ def printSecrets(filename, env, secretEnv): "password": fromSecret("ssh-password"), "script": [x.replace("$$filename$$", filename) for x in [ "rm -f env-stack", - ] + map(echofilename, env) - + mapSecret(echoSecret, secretEnv)] + ] + map(echo, env) + + map(echoSecret, secretEnv)] } } def wait(delay, name): From 93c24fb653e19ef79b56c1360eca0ff8856a22fa Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 11:05:25 +0100 Subject: [PATCH 089/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index b932808..b47193e 100644 --- a/.drone.star +++ b/.drone.star @@ -11,12 +11,12 @@ def map(fn, l): def secretToEnvironment(secret): return secret.replace("-", "_").upper() def echo(secret): - return "export {environment}='${environment}' >> $$filename$$ # {secret}".format( + return "echo 'export {environment}=${environment}' >> $$filename$$ # {secret}".format( secret = secret, environment = secret.replace("-", "_").upper(), ) def echoSecret(secret): - return "export {environment}=??? >> $$filename$$ # {secret}".format( + return "echo 'export {environment}=???' >> $$filename$$ # {secret}".format( secret = secret, environment = secret.replace("-", "_").upper() ) From 846a46076d75397814136a2e4ec75f5baeeba636 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 11:10:02 +0100 Subject: [PATCH 090/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index b47193e..d535b00 100644 --- a/.drone.star +++ b/.drone.star @@ -11,12 +11,12 @@ def map(fn, l): def secretToEnvironment(secret): return secret.replace("-", "_").upper() def echo(secret): - return "echo 'export {environment}=${environment}' >> $$filename$$ # {secret}".format( + return 'echo "export {environment}=${environment}" >> $$filename$$ # {secret}'.format( secret = secret, environment = secret.replace("-", "_").upper(), ) def echoSecret(secret): - return "echo 'export {environment}=???' >> $$filename$$ # {secret}".format( + return 'echo 'export {environment}=???' >> $$filename$$ # {secret}'.format( secret = secret, environment = secret.replace("-", "_").upper() ) From 33559d4b84569f44e41315d5bcedd08345c761ab Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 11:11:20 +0100 Subject: [PATCH 091/155] . --- .drone.star | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index d535b00..cd85b0b 100644 --- a/.drone.star +++ b/.drone.star @@ -11,12 +11,12 @@ def map(fn, l): def secretToEnvironment(secret): return secret.replace("-", "_").upper() def echo(secret): - return 'echo "export {environment}=${environment}" >> $$filename$$ # {secret}'.format( + return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( secret = secret, environment = secret.replace("-", "_").upper(), ) def echoSecret(secret): - return 'echo 'export {environment}=???' >> $$filename$$ # {secret}'.format( + return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( secret = secret, environment = secret.replace("-", "_").upper() ) @@ -37,7 +37,7 @@ def printSecrets(filename, env, secretEnv): "port": fromSecret("ssh-port"), "username": fromSecret("ssh-user"), "password": fromSecret("ssh-password"), - "script": [x.replace("$$filename$$", filename) for x in [ + "script": [x.replace("***filename***", filename) for x in [ "rm -f env-stack", ] + map(echo, env) + map(echoSecret, secretEnv)] From af9564f438bf1dac3d2ed02a778b1b362e669656 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 11:39:42 +0100 Subject: [PATCH 092/155] . --- .drone.star | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/.drone.star b/.drone.star index cd85b0b..781dce7 100644 --- a/.drone.star +++ b/.drone.star @@ -175,7 +175,7 @@ def deploy(): ] } } -def steps(name, dependsOn): +def pipeline(name, steps, dependsOn): return { "kind": "pipeline", "name": name, @@ -202,18 +202,7 @@ def steps(name, dependsOn): ], ), wait(15, "wait"), - build("guacamole-postgresql"), - build("ngrok-gitea"), - build("letsencrypt-nginx"), - buildHome(), - buildNginx("blog"), - buildNginx("drone"), - buildNginx("git"), - buildNginx("remote"), - buildNginx("chat"), - scp("~/gitea-drone-stack"), - deploy(), - ], + ] + steps, "services": [ { "name": "docker", @@ -246,14 +235,32 @@ def steps(name, dependsOn): } def main(ctx): - print(ctx) - print('where is this') if ctx.build.branch == 'home-deploy': return [ - steps('home', []), + pipeline( + 'home', + [ + build("guacamole-postgresql"), + build("ngrok-gitea"), + build("letsencrypt-nginx"), + buildHome(), + buildNginx("blog"), + buildNginx("drone"), + buildNginx("git"), + buildNginx("remote"), + buildNginx("chat"), + scp("~/gitea-drone-stack"), + deploy(), + ], + [], + ), ] else: return [ - steps('first', []), + pipeline( + 'first', + [], + [], + ), ] \ No newline at end of file From e8528b7a5ea85d770aad63853e5e4818d2a22f71 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 11:52:28 +0100 Subject: [PATCH 093/155] . --- .drone.star | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/.drone.star b/.drone.star index 781dce7..c319e56 100644 --- a/.drone.star +++ b/.drone.star @@ -132,7 +132,10 @@ def scp(target): ], }, } -def deploy(): +def deploy( + filename, + folder, +): secrets = [ "drone-rpc-secret", "drone-gitea-client-id", @@ -168,10 +171,10 @@ def deploy(): "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-blog", "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", "docker network prune -f", - "cd /home/$SSH_USER/gitea-drone-stack", + "cd {folder}".format(folder=folder), "docker stack rm gitea", "sleep 60", - "docker stack deploy -c docker-compose-home.yml gitea", + "docker stack deploy -c {filename} gitea".format(filename = filename), ] } } @@ -238,10 +241,32 @@ def main(ctx): if ctx.build.branch == 'home-deploy': return [ pipeline( - 'home', + 'home-deploy', + [ + #build("guacamole-postgresql"), + #build("ngrok-gitea"), + #build("letsencrypt-nginx"), + #buildHome(), + #buildNginx("blog"), + #buildNginx("drone"), + #buildNginx("git"), + #buildNginx("remote"), + #buildNginx("chat"), + scp("~/gitea-drone-stack"), + deploy( + "docker-compose-home.yml", + "~/gitea-drone-stack", + ), + ], + [], + ), + ] + if ctx.build.branch == 'do': + return [ + pipeline( + 'do-deploy', [ build("guacamole-postgresql"), - build("ngrok-gitea"), build("letsencrypt-nginx"), buildHome(), buildNginx("blog"), @@ -249,18 +274,10 @@ def main(ctx): buildNginx("git"), buildNginx("remote"), buildNginx("chat"), - scp("~/gitea-drone-stack"), - deploy(), + scp("~/stack-deploy"), + #deploy("docker-compose-do.yml", "~/stack-deploy"), ], [], ), ] - else: - return [ - pipeline( - 'first', - [], - [], - ), - ] \ No newline at end of file From bbd24a73de98dc5c3443eef9687816a82b7fd238 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 11:56:24 +0100 Subject: [PATCH 094/155] . --- .drone.star | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.star b/.drone.star index c319e56..0c24ead 100644 --- a/.drone.star +++ b/.drone.star @@ -164,6 +164,8 @@ def deploy( "script": [ "set -e" ] + map(export, secrets) + [ + "echo {folder}".format(folder=folder), + "cd {folder}".format(folder=folder), "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-git", "docker pull $${LOCAL_DOCKER_REGISTRY}nginx-home1", "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-chat", From 1c4dfbc919cb896c55a9d153e83eb17acfb42839 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 11:58:36 +0100 Subject: [PATCH 095/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 0c24ead..1acb1bb 100644 --- a/.drone.star +++ b/.drone.star @@ -254,10 +254,10 @@ def main(ctx): #buildNginx("git"), #buildNginx("remote"), #buildNginx("chat"), - scp("~/gitea-drone-stack"), + scp("/home/giles/gitea-drone-stack"), deploy( "docker-compose-home.yml", - "~/gitea-drone-stack", + "/home/giles/gitea-drone-stack", ), ], [], From 1804eaceb057dff18d00201b5f7661886325b9be Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 12:43:26 +0100 Subject: [PATCH 096/155] . --- .drone.star | 3 ++- drone-starlark/Dockerfile | 2 ++ drone-starlark/repos/from-secret.star | 4 ++++ guacamole-postgresql/Dockerfile | 1 - starlark/steps.star | 14 -------------- 5 files changed, 8 insertions(+), 16 deletions(-) create mode 100644 drone-starlark/Dockerfile create mode 100644 drone-starlark/repos/from-secret.star delete mode 100644 starlark/steps.star diff --git a/.drone.star b/.drone.star index 1acb1bb..850b32b 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ def fromSecret(name): return { "from_secret": name - } + } def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] @@ -249,6 +249,7 @@ def main(ctx): #build("ngrok-gitea"), #build("letsencrypt-nginx"), #buildHome(), + build("drone-starlark"), #buildNginx("blog"), #buildNginx("drone"), #buildNginx("git"), diff --git a/drone-starlark/Dockerfile b/drone-starlark/Dockerfile new file mode 100644 index 0000000..776096e --- /dev/null +++ b/drone-starlark/Dockerfile @@ -0,0 +1,2 @@ +FROM drone/drone-convert-starlark +COPY repos /repos \ No newline at end of file diff --git a/drone-starlark/repos/from-secret.star b/drone-starlark/repos/from-secret.star new file mode 100644 index 0000000..79140f9 --- /dev/null +++ b/drone-starlark/repos/from-secret.star @@ -0,0 +1,4 @@ +def fromSecret(name): + return { + "from_secret": name + } \ No newline at end of file diff --git a/guacamole-postgresql/Dockerfile b/guacamole-postgresql/Dockerfile index 180cf45..dfaaaee 100644 --- a/guacamole-postgresql/Dockerfile +++ b/guacamole-postgresql/Dockerfile @@ -1,3 +1,2 @@ FROM postgres:12 - COPY *.sql / \ No newline at end of file diff --git a/starlark/steps.star b/starlark/steps.star deleted file mode 100644 index f1f97f3..0000000 --- a/starlark/steps.star +++ /dev/null @@ -1,14 +0,0 @@ -def steps(): - return { - "kind": "pipeline", - "name": "build", - "steps": [ - { - "name": "build", - "image": "alpine", - "commands": [ - "echo hello 'star lark'", - ], - }, - ], - } \ No newline at end of file From b5ea4ffe25e59690296574308c9628e9e6bcf965 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 12:45:22 +0100 Subject: [PATCH 097/155] . --- docker-compose-home.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 690a41d..bc32a65 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -169,15 +169,13 @@ services: replicas: 1 restart_policy: condition: any - image: drone/drone-convert-starlark + image: ${LOCAL_DOCKER_REGISTRY}drone-starlark environment: - DRONE_DEBUG=true - DRONE_SECRET=${DRONE_CONVERT_SECRET} - DRONE_STARLARK_REPO_PATHS=this:/repos networks: - appnet - volumes: - - /home/giles/gitea-drone-stack:/repos registry: deploy: From 6f9ed00399c6b7c690b175ec7fbe8f1ee006686a Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 12:50:46 +0100 Subject: [PATCH 098/155] . --- .drone.star | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 850b32b..cfd66c0 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,4 @@ -def fromSecret(name): - return { - "from_secret": name - } +load("@this//:from-secret.star", "fromSecret") def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] From 9c7ae96daf62b5ff79bf5ca268d4bcdddc35ed93 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 12:53:32 +0100 Subject: [PATCH 099/155] . --- drone-starlark/repos/print-secrets.star | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 drone-starlark/repos/print-secrets.star diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star new file mode 100644 index 0000000..75ef634 --- /dev/null +++ b/drone-starlark/repos/print-secrets.star @@ -0,0 +1,32 @@ +def echo(secret): + return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper(), + ) +def echoSecret(secret): + return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper() + ) + +def export(secret): + return "export {toCaps}=${toCaps}".format( + toCaps = secretToEnvironment(secret), + ) +def printSecrets(filename, env, secretEnv): + return { + "name": "print secrets", + "image": "appleboy/drone-ssh", + "environment": environment(env), + "settings": { + "envs": [x.replace("-", "_") for x in env ], + "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 env-stack", + ] + map(echo, env) + + map(echoSecret, secretEnv)] + } + } From 42dfb66a3f70c67f6a2efe13799a2f4aec9895df Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 12:56:39 +0100 Subject: [PATCH 100/155] . --- drone-starlark/repos/map.star | 2 ++ drone-starlark/repos/print-secrets.star | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 drone-starlark/repos/map.star diff --git a/drone-starlark/repos/map.star b/drone-starlark/repos/map.star new file mode 100644 index 0000000..d7828a0 --- /dev/null +++ b/drone-starlark/repos/map.star @@ -0,0 +1,2 @@ +def map(fn, l): + return [fn(x) for x in l] diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 75ef634..ddd076b 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,3 +1,5 @@ +load("@this//:map.star", "map") + def echo(secret): return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( secret = secret, From fbe17c549f9e9929c165dda1e25f4f866add2966 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:02:57 +0100 Subject: [PATCH 101/155] . --- .drone.star | 44 +++---------------------- drone-starlark/repos/print-secrets.star | 8 +++++ 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/.drone.star b/.drone.star index cfd66c0..8196162 100644 --- a/.drone.star +++ b/.drone.star @@ -1,45 +1,9 @@ load("@this//:from-secret.star", "fromSecret") -def environment(env): - return dict( - [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] - ) -def map(fn, l): - return [fn(x) for x in l] -def secretToEnvironment(secret): - return secret.replace("-", "_").upper() -def echo(secret): - return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper(), - ) -def echoSecret(secret): - return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper() - ) +load("@this//:print-secrets.star", "printSecrets") +load("@this//:print-secrets.star", "environment") +load("@this//:print-secrets.star", "export") +load("@this//:map.star", "map") -def export(secret): - return "export {toCaps}=${toCaps}".format( - toCaps = secretToEnvironment(secret), - ) -def printSecrets(filename, env, secretEnv): - - return { - "name": "print secrets", - "image": "appleboy/drone-ssh", - "environment": environment(env), - "settings": { - "envs": [x.replace("-", "_") for x in env ], - "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 env-stack", - ] + map(echo, env) - + map(echoSecret, secretEnv)] - } - } def wait(delay, name): return { "name": name, diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index ddd076b..387440c 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,4 +1,12 @@ load("@this//:map.star", "map") +def environment(env): + return dict( + [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] + ) +def map(fn, l): + return [fn(x) for x in l] +def secretToEnvironment(secret): + return secret.replace("-", "_").upper() def echo(secret): return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( From 3616c7db3ffd85ff24f96a73bceba4aeb3418666 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:05:32 +0100 Subject: [PATCH 102/155] . --- .drone.star | 45 ++++++++++++++++++++++--- drone-starlark/repos/print-secrets.star | 1 + 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 8196162..bfbee8f 100644 --- a/.drone.star +++ b/.drone.star @@ -1,9 +1,46 @@ load("@this//:from-secret.star", "fromSecret") -load("@this//:print-secrets.star", "printSecrets") -load("@this//:print-secrets.star", "environment") -load("@this//:print-secrets.star", "export") -load("@this//:map.star", "map") +def environment(env): + return dict( + [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] + ) +def map(fn, l): + return [fn(x) for x in l] +def secretToEnvironment(secret): + return secret.replace("-", "_").upper() +def echo(secret): + return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper(), + ) +def echoSecret(secret): + return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper() + ) + +def export(secret): + return "export {toCaps}=${toCaps}".format( + toCaps = secretToEnvironment(secret), + ) +def printSecrets(filename, env, secretEnv): + + return { + "name": "print secrets", + "image": "appleboy/drone-ssh", + "environment": environment(env), + "settings": { + "envs": [x.replace("-", "_") for x in env ], + "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 env-stack", + ] + map(echo, env) + + map(echoSecret, secretEnv)] + } + } def wait(delay, name): return { "name": name, diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 387440c..40c2bd1 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -5,6 +5,7 @@ def environment(env): ) def map(fn, l): return [fn(x) for x in l] + def secretToEnvironment(secret): return secret.replace("-", "_").upper() From ddcde502ca11385028e0d0112181c653af15f8b7 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:08:29 +0100 Subject: [PATCH 103/155] . --- .drone.star | 45 ++++----------------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/.drone.star b/.drone.star index bfbee8f..8196162 100644 --- a/.drone.star +++ b/.drone.star @@ -1,46 +1,9 @@ load("@this//:from-secret.star", "fromSecret") +load("@this//:print-secrets.star", "printSecrets") +load("@this//:print-secrets.star", "environment") +load("@this//:print-secrets.star", "export") +load("@this//:map.star", "map") -def environment(env): - return dict( - [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] - ) -def map(fn, l): - return [fn(x) for x in l] -def secretToEnvironment(secret): - return secret.replace("-", "_").upper() -def echo(secret): - return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper(), - ) -def echoSecret(secret): - return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper() - ) - -def export(secret): - return "export {toCaps}=${toCaps}".format( - toCaps = secretToEnvironment(secret), - ) -def printSecrets(filename, env, secretEnv): - - return { - "name": "print secrets", - "image": "appleboy/drone-ssh", - "environment": environment(env), - "settings": { - "envs": [x.replace("-", "_") for x in env ], - "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 env-stack", - ] + map(echo, env) - + map(echoSecret, secretEnv)] - } - } def wait(delay, name): return { "name": name, From 37229f79a1a9fbe9067a5a78e39bbfdd24fdd854 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:09:37 +0100 Subject: [PATCH 104/155] . --- .drone.star | 45 ++++++++++++++++++++++--- drone-starlark/repos/print-secrets.star | 2 -- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/.drone.star b/.drone.star index 8196162..bfbee8f 100644 --- a/.drone.star +++ b/.drone.star @@ -1,9 +1,46 @@ load("@this//:from-secret.star", "fromSecret") -load("@this//:print-secrets.star", "printSecrets") -load("@this//:print-secrets.star", "environment") -load("@this//:print-secrets.star", "export") -load("@this//:map.star", "map") +def environment(env): + return dict( + [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] + ) +def map(fn, l): + return [fn(x) for x in l] +def secretToEnvironment(secret): + return secret.replace("-", "_").upper() +def echo(secret): + return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper(), + ) +def echoSecret(secret): + return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper() + ) + +def export(secret): + return "export {toCaps}=${toCaps}".format( + toCaps = secretToEnvironment(secret), + ) +def printSecrets(filename, env, secretEnv): + + return { + "name": "print secrets", + "image": "appleboy/drone-ssh", + "environment": environment(env), + "settings": { + "envs": [x.replace("-", "_") for x in env ], + "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 env-stack", + ] + map(echo, env) + + map(echoSecret, secretEnv)] + } + } def wait(delay, name): return { "name": name, diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 40c2bd1..430455a 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -3,8 +3,6 @@ def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] ) -def map(fn, l): - return [fn(x) for x in l] def secretToEnvironment(secret): return secret.replace("-", "_").upper() From 722f50ca1c8b47fc9eb4bd41db8cfe01023a5f74 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:13:44 +0100 Subject: [PATCH 105/155] . --- .drone.star | 45 ++++----------------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/.drone.star b/.drone.star index bfbee8f..8196162 100644 --- a/.drone.star +++ b/.drone.star @@ -1,46 +1,9 @@ load("@this//:from-secret.star", "fromSecret") +load("@this//:print-secrets.star", "printSecrets") +load("@this//:print-secrets.star", "environment") +load("@this//:print-secrets.star", "export") +load("@this//:map.star", "map") -def environment(env): - return dict( - [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] - ) -def map(fn, l): - return [fn(x) for x in l] -def secretToEnvironment(secret): - return secret.replace("-", "_").upper() -def echo(secret): - return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper(), - ) -def echoSecret(secret): - return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper() - ) - -def export(secret): - return "export {toCaps}=${toCaps}".format( - toCaps = secretToEnvironment(secret), - ) -def printSecrets(filename, env, secretEnv): - - return { - "name": "print secrets", - "image": "appleboy/drone-ssh", - "environment": environment(env), - "settings": { - "envs": [x.replace("-", "_") for x in env ], - "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 env-stack", - ] + map(echo, env) - + map(echoSecret, secretEnv)] - } - } def wait(delay, name): return { "name": name, From e99863bb19e3edea892d80b325b439b3b74002f0 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:15:31 +0100 Subject: [PATCH 106/155] . --- .drone.star | 45 ++++++++++++++++++++++--- drone-starlark/repos/print-secrets.star | 1 + 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index 8196162..bfbee8f 100644 --- a/.drone.star +++ b/.drone.star @@ -1,9 +1,46 @@ load("@this//:from-secret.star", "fromSecret") -load("@this//:print-secrets.star", "printSecrets") -load("@this//:print-secrets.star", "environment") -load("@this//:print-secrets.star", "export") -load("@this//:map.star", "map") +def environment(env): + return dict( + [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] + ) +def map(fn, l): + return [fn(x) for x in l] +def secretToEnvironment(secret): + return secret.replace("-", "_").upper() +def echo(secret): + return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper(), + ) +def echoSecret(secret): + return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper() + ) + +def export(secret): + return "export {toCaps}=${toCaps}".format( + toCaps = secretToEnvironment(secret), + ) +def printSecrets(filename, env, secretEnv): + + return { + "name": "print secrets", + "image": "appleboy/drone-ssh", + "environment": environment(env), + "settings": { + "envs": [x.replace("-", "_") for x in env ], + "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 env-stack", + ] + map(echo, env) + + map(echoSecret, secretEnv)] + } + } def wait(delay, name): return { "name": name, diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 430455a..10426c5 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,4 +1,5 @@ load("@this//:map.star", "map") +load("@this//:from-secret.star", "fromSecret") def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] From b5ccd5c3d635e52bcf0cf2079986c6635311f0a4 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:17:54 +0100 Subject: [PATCH 107/155] . --- .drone.star | 45 ++++----------------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/.drone.star b/.drone.star index bfbee8f..8196162 100644 --- a/.drone.star +++ b/.drone.star @@ -1,46 +1,9 @@ load("@this//:from-secret.star", "fromSecret") +load("@this//:print-secrets.star", "printSecrets") +load("@this//:print-secrets.star", "environment") +load("@this//:print-secrets.star", "export") +load("@this//:map.star", "map") -def environment(env): - return dict( - [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] - ) -def map(fn, l): - return [fn(x) for x in l] -def secretToEnvironment(secret): - return secret.replace("-", "_").upper() -def echo(secret): - return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper(), - ) -def echoSecret(secret): - return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper() - ) - -def export(secret): - return "export {toCaps}=${toCaps}".format( - toCaps = secretToEnvironment(secret), - ) -def printSecrets(filename, env, secretEnv): - - return { - "name": "print secrets", - "image": "appleboy/drone-ssh", - "environment": environment(env), - "settings": { - "envs": [x.replace("-", "_") for x in env ], - "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 env-stack", - ] + map(echo, env) - + map(echoSecret, secretEnv)] - } - } def wait(delay, name): return { "name": name, From 8e7e549162e745ecedcb0ccc086bd53eeb9886d0 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:21:26 +0100 Subject: [PATCH 109/155] . --- .drone.star | 50 ++++++++++++++++++++++--- drone-starlark/repos/print-secrets.star | 2 +- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/.drone.star b/.drone.star index 8196162..4bf2cf1 100644 --- a/.drone.star +++ b/.drone.star @@ -1,9 +1,49 @@ -load("@this//:from-secret.star", "fromSecret") -load("@this//:print-secrets.star", "printSecrets") -load("@this//:print-secrets.star", "environment") -load("@this//:print-secrets.star", "export") -load("@this//:map.star", "map") +load("@this//:fromsecret.star", "example_step") +def fromSecret(name): + return { + "from_secret": name + } +def environment(env): + return dict( + [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] + ) +def map(fn, l): + return [fn(x) for x in l] +def secretToEnvironment(secret): + return secret.replace("-", "_").upper() +def echo(secret): + return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper(), + ) +def echoSecret(secret): + return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper() + ) +def export(secret): + return "export {toCaps}=${toCaps}".format( + toCaps = secretToEnvironment(secret), + ) +def printSecrets(filename, env, secretEnv): + + return { + "name": "print secrets", + "image": "appleboy/drone-ssh", + "environment": environment(env), + "settings": { + "envs": [x.replace("-", "_") for x in env ], + "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 env-stack", + ] + map(echo, env) + + map(echoSecret, secretEnv)] + } + } def wait(delay, name): return { "name": name, diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 10426c5..38c6c88 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -21,7 +21,7 @@ def echoSecret(secret): def export(secret): return "export {toCaps}=${toCaps}".format( - toCaps = secretToEnvironment(secret), + toCaps = secret.replace("-", "_").upper(), ) def printSecrets(filename, env, secretEnv): return { From ac99ce2d2e8caf0a96204067b7ecf80acfe830b8 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:22:13 +0100 Subject: [PATCH 110/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 4bf2cf1..a082aa3 100644 --- a/.drone.star +++ b/.drone.star @@ -1,4 +1,4 @@ -load("@this//:fromsecret.star", "example_step") +load("@this//:from-secret.star", "example_step") def fromSecret(name): return { "from_secret": name From 427c814319d851eedd4441b5f3fd259250ee536e Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:24:13 +0100 Subject: [PATCH 111/155] . --- .drone.star | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.drone.star b/.drone.star index a082aa3..bfbee8f 100644 --- a/.drone.star +++ b/.drone.star @@ -1,8 +1,5 @@ -load("@this//:from-secret.star", "example_step") -def fromSecret(name): - return { - "from_secret": name - } +load("@this//:from-secret.star", "fromSecret") + def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] From bdc1396b2fe2cbabf423ed5089435d86e9027ea8 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:26:41 +0100 Subject: [PATCH 112/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index bfbee8f..7cecfb4 100644 --- a/.drone.star +++ b/.drone.star @@ -1,4 +1,5 @@ load("@this//:from-secret.star", "fromSecret") +load("@this//:print-secrets.star", "printSecrets") def environment(env): return dict( @@ -23,8 +24,7 @@ def export(secret): return "export {toCaps}=${toCaps}".format( toCaps = secretToEnvironment(secret), ) -def printSecrets(filename, env, secretEnv): - +def printSecrets1(filename, env, secretEnv): return { "name": "print secrets", "image": "appleboy/drone-ssh", From 88133b0e82a3713eaf9c08613a66001391129255 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:29:32 +0100 Subject: [PATCH 113/155] . --- .drone.star | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/.drone.star b/.drone.star index 7cecfb4..bc90d24 100644 --- a/.drone.star +++ b/.drone.star @@ -1,46 +1,8 @@ load("@this//:from-secret.star", "fromSecret") +load("@this//:map.star", "map") load("@this//:print-secrets.star", "printSecrets") +load("@this//:print-secrets.star", "environment") -def environment(env): - return dict( - [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] - ) -def map(fn, l): - return [fn(x) for x in l] -def secretToEnvironment(secret): - return secret.replace("-", "_").upper() -def echo(secret): - return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper(), - ) -def echoSecret(secret): - return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper() - ) - -def export(secret): - return "export {toCaps}=${toCaps}".format( - toCaps = secretToEnvironment(secret), - ) -def printSecrets1(filename, env, secretEnv): - return { - "name": "print secrets", - "image": "appleboy/drone-ssh", - "environment": environment(env), - "settings": { - "envs": [x.replace("-", "_") for x in env ], - "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 env-stack", - ] + map(echo, env) - + map(echoSecret, secretEnv)] - } - } def wait(delay, name): return { "name": name, From ecbc7195e33f9fb529962a9c1346a211d419a7f7 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:32:28 +0100 Subject: [PATCH 114/155] . --- drone-starlark/repos/environment.star | 5 +++++ drone-starlark/repos/print-secrets.star | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 drone-starlark/repos/environment.star diff --git a/drone-starlark/repos/environment.star b/drone-starlark/repos/environment.star new file mode 100644 index 0000000..12a70b2 --- /dev/null +++ b/drone-starlark/repos/environment.star @@ -0,0 +1,5 @@ +load("@this//:from-secret.star", "fromSecret") +def environment(env): + return dict( + [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] + ) diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 38c6c88..0f04e96 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,10 +1,7 @@ load("@this//:map.star", "map") load("@this//:from-secret.star", "fromSecret") -def environment(env): - return dict( - [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] - ) - +load("@this//:environment", "environment") + def secretToEnvironment(secret): return secret.replace("-", "_").upper() From 9eda8e6a480e5054caefdc97399ab6da89332fe5 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:33:33 +0100 Subject: [PATCH 115/155] . --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index bc90d24..1e2f4e4 100644 --- a/.drone.star +++ b/.drone.star @@ -2,6 +2,7 @@ load("@this//:from-secret.star", "fromSecret") load("@this//:map.star", "map") load("@this//:print-secrets.star", "printSecrets") load("@this//:print-secrets.star", "environment") +load("@this//:print-secrets.star", "export") def wait(delay, name): return { From 601d87537ab1aa340e8f41d95527086bcb3bd8eb Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:44:27 +0100 Subject: [PATCH 120/155] . --- .drone.star | 4 ++-- drone-starlark/repos/print-secrets.star | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index 1e2f4e4..c8e945e 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ load("@this//:from-secret.star", "fromSecret") load("@this//:map.star", "map") load("@this//:print-secrets.star", "printSecrets") -load("@this//:print-secrets.star", "environment") +load("@this//:environment.star", "environment") load("@this//:print-secrets.star", "export") def wait(delay, name): @@ -136,7 +136,7 @@ def deploy( "docker network prune -f", "cd {folder}".format(folder=folder), "docker stack rm gitea", - "sleep 60", + "sleep 30", "docker stack deploy -c {filename} gitea".format(filename = filename), ] } diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 0f04e96..0ebaf79 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,6 +1,6 @@ load("@this//:map.star", "map") load("@this//:from-secret.star", "fromSecret") -load("@this//:environment", "environment") +load("@this//:environment.star", "environment") def secretToEnvironment(secret): return secret.replace("-", "_").upper() From e82b1be08bb446cbbd7989669b1d5fc01ec0ba9f Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 13:59:31 +0100 Subject: [PATCH 121/155] . --- .drone.star | 56 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/.drone.star b/.drone.star index c8e945e..0c24ead 100644 --- a/.drone.star +++ b/.drone.star @@ -1,9 +1,48 @@ -load("@this//:from-secret.star", "fromSecret") -load("@this//:map.star", "map") -load("@this//:print-secrets.star", "printSecrets") -load("@this//:environment.star", "environment") -load("@this//:print-secrets.star", "export") +def fromSecret(name): + return { + "from_secret": name + } +def environment(env): + return dict( + [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] + ) +def map(fn, l): + return [fn(x) for x in l] +def secretToEnvironment(secret): + return secret.replace("-", "_").upper() +def echo(secret): + return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper(), + ) +def echoSecret(secret): + return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secret.replace("-", "_").upper() + ) +def export(secret): + return "export {toCaps}=${toCaps}".format( + toCaps = secretToEnvironment(secret), + ) +def printSecrets(filename, env, secretEnv): + + return { + "name": "print secrets", + "image": "appleboy/drone-ssh", + "environment": environment(env), + "settings": { + "envs": [x.replace("-", "_") for x in env ], + "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 env-stack", + ] + map(echo, env) + + map(echoSecret, secretEnv)] + } + } def wait(delay, name): return { "name": name, @@ -136,7 +175,7 @@ def deploy( "docker network prune -f", "cd {folder}".format(folder=folder), "docker stack rm gitea", - "sleep 30", + "sleep 60", "docker stack deploy -c {filename} gitea".format(filename = filename), ] } @@ -210,16 +249,15 @@ def main(ctx): #build("ngrok-gitea"), #build("letsencrypt-nginx"), #buildHome(), - build("drone-starlark"), #buildNginx("blog"), #buildNginx("drone"), #buildNginx("git"), #buildNginx("remote"), #buildNginx("chat"), - scp("/home/giles/gitea-drone-stack"), + scp("~/gitea-drone-stack"), deploy( "docker-compose-home.yml", - "/home/giles/gitea-drone-stack", + "~/gitea-drone-stack", ), ], [], From dd1b94cd880722ac9cdf52b09cb6fafb2a9d77cc Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:00:59 +0100 Subject: [PATCH 122/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 0c24ead..61cc0a7 100644 --- a/.drone.star +++ b/.drone.star @@ -257,7 +257,7 @@ def main(ctx): scp("~/gitea-drone-stack"), deploy( "docker-compose-home.yml", - "~/gitea-drone-stack", + "/home/giles/gitea-drone-stack", ), ], [], From 82a9b7ec26d1c960b49261d2b7a200612808effd Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:08:35 +0100 Subject: [PATCH 123/155] . --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index 61cc0a7..86c83e5 100644 --- a/.drone.star +++ b/.drone.star @@ -172,6 +172,7 @@ def deploy( "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-remote", "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-blog", "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", + "docker pull $${LOCAL_DOCKER_REGISTRY}drone-starlark", "docker network prune -f", "cd {folder}".format(folder=folder), "docker stack rm gitea", From 9ce5e7b16b527e72ed98070c59ed3bfff01ac721 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:11:56 +0100 Subject: [PATCH 124/155] . --- .drone.star | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/.drone.star b/.drone.star index 86c83e5..e6007ec 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,6 @@ -def fromSecret(name): - return { - "from_secret": name - } +load("@this//:from-secret.star", "fromSecret") +load("@this//:print-secrets.star", "printSecrets") + def environment(env): return dict( [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] @@ -25,24 +24,6 @@ def export(secret): return "export {toCaps}=${toCaps}".format( toCaps = secretToEnvironment(secret), ) -def printSecrets(filename, env, secretEnv): - - return { - "name": "print secrets", - "image": "appleboy/drone-ssh", - "environment": environment(env), - "settings": { - "envs": [x.replace("-", "_") for x in env ], - "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 env-stack", - ] + map(echo, env) - + map(echoSecret, secretEnv)] - } - } def wait(delay, name): return { "name": name, @@ -176,7 +157,7 @@ def deploy( "docker network prune -f", "cd {folder}".format(folder=folder), "docker stack rm gitea", - "sleep 60", + "sleep 30", "docker stack deploy -c {filename} gitea".format(filename = filename), ] } From 908e76ca43b8323c1e6b82c51bcdd8905842e81a Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:19:30 +0100 Subject: [PATCH 126/155] . --- .drone.star | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.star b/.drone.star index e6007ec..4c9199a 100644 --- a/.drone.star +++ b/.drone.star @@ -230,6 +230,7 @@ def main(ctx): #build("guacamole-postgresql"), #build("ngrok-gitea"), #build("letsencrypt-nginx"), + build("drone-starlark"), #buildHome(), #buildNginx("blog"), #buildNginx("drone"), From c2291a848521486249f2930616d37ee96806ccc8 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:23:25 +0100 Subject: [PATCH 127/155] . --- drone-starlark/repos/print-secrets.star | 10 ++++------ drone-starlark/repos/secret-to-environment.star | 2 ++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 drone-starlark/repos/secret-to-environment.star diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 0ebaf79..7082082 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,24 +1,22 @@ load("@this//:map.star", "map") load("@this//:from-secret.star", "fromSecret") load("@this//:environment.star", "environment") - -def secretToEnvironment(secret): - return secret.replace("-", "_").upper() +load("@this//:secretTonvironment.star", "secretToEnvironment") def echo(secret): return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( secret = secret, - environment = secret.replace("-", "_").upper(), + environment = secretToEnvironment(secret), #secret.replace("-", "_").upper(), ) def echoSecret(secret): return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( secret = secret, - environment = secret.replace("-", "_").upper() + environment = secretToEnvironment(secret), # .replace("-", "_").upper() ) def export(secret): return "export {toCaps}=${toCaps}".format( - toCaps = secret.replace("-", "_").upper(), + toCaps = secretToEnvironment(secret), #secret.replace("-", "_").upper(), ) def printSecrets(filename, env, secretEnv): return { diff --git a/drone-starlark/repos/secret-to-environment.star b/drone-starlark/repos/secret-to-environment.star new file mode 100644 index 0000000..8dd501e --- /dev/null +++ b/drone-starlark/repos/secret-to-environment.star @@ -0,0 +1,2 @@ +def secretToEnvironment(secret): + return secret.replace("-", "_").upper() From 2364826431d61416394068a77efe0bd7b50666f0 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:27:01 +0100 Subject: [PATCH 128/155] . --- drone-starlark/repos/print-secrets.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 7082082..baa9dbb 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,7 +1,7 @@ load("@this//:map.star", "map") load("@this//:from-secret.star", "fromSecret") load("@this//:environment.star", "environment") -load("@this//:secretTonvironment.star", "secretToEnvironment") +load("@this//:secretToEnvironment.star", "secretToEnvironment") def echo(secret): return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( From 496dc435c97d05c870170d6bd446923dc44f1432 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:27:59 +0100 Subject: [PATCH 129/155] . --- drone-starlark/repos/print-secrets.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index baa9dbb..426c4e2 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,7 +1,7 @@ load("@this//:map.star", "map") load("@this//:from-secret.star", "fromSecret") load("@this//:environment.star", "environment") -load("@this//:secretToEnvironment.star", "secretToEnvironment") +load("@this//:secret-to-environment.star", "secretToEnvironment") def echo(secret): return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( From f080701eb839c834cdc87cc89f8374f4d3d5bca3 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:34:46 +0100 Subject: [PATCH 130/155] . --- drone-starlark/repos/echo-secret.star | 7 +++++++ drone-starlark/repos/echo.star | 7 +++++++ drone-starlark/repos/export.star | 6 ++++++ drone-starlark/repos/print-secrets.star | 19 +++---------------- 4 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 drone-starlark/repos/echo-secret.star create mode 100644 drone-starlark/repos/echo.star create mode 100644 drone-starlark/repos/export.star diff --git a/drone-starlark/repos/echo-secret.star b/drone-starlark/repos/echo-secret.star new file mode 100644 index 0000000..bf0901a --- /dev/null +++ b/drone-starlark/repos/echo-secret.star @@ -0,0 +1,7 @@ +load("@this//:secret-to-environment.star", "secretToEnvironment") + +def echoSecret(secret): + return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secretToEnvironment(secret), # .replace("-", "_").upper() + ) diff --git a/drone-starlark/repos/echo.star b/drone-starlark/repos/echo.star new file mode 100644 index 0000000..4f1cc1c --- /dev/null +++ b/drone-starlark/repos/echo.star @@ -0,0 +1,7 @@ +load("@this//:secret-to-environment.star", "secretToEnvironment") + +def echo(secret): + return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( + secret = secret, + environment = secretToEnvironment(secret), #secret.replace("-", "_").upper(), + ) diff --git a/drone-starlark/repos/export.star b/drone-starlark/repos/export.star new file mode 100644 index 0000000..7d47c10 --- /dev/null +++ b/drone-starlark/repos/export.star @@ -0,0 +1,6 @@ +load("@this//:secret-to-environment.star", "secretToEnvironment") + +def export(secret): + return "export {toCaps}=${toCaps}".format( + toCaps = secretToEnvironment(secret), #secret.replace("-", "_").upper(), + ) diff --git a/drone-starlark/repos/print-secrets.star b/drone-starlark/repos/print-secrets.star index 426c4e2..d7508bb 100644 --- a/drone-starlark/repos/print-secrets.star +++ b/drone-starlark/repos/print-secrets.star @@ -1,23 +1,10 @@ load("@this//:map.star", "map") load("@this//:from-secret.star", "fromSecret") load("@this//:environment.star", "environment") -load("@this//:secret-to-environment.star", "secretToEnvironment") +load("@this//:echo.star", "echo") +load("@this//:export.star", "export") +load("@this//:echo-secret.star", "echoSecret") -def echo(secret): - return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secretToEnvironment(secret), #secret.replace("-", "_").upper(), - ) -def echoSecret(secret): - return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secretToEnvironment(secret), # .replace("-", "_").upper() - ) - -def export(secret): - return "export {toCaps}=${toCaps}".format( - toCaps = secretToEnvironment(secret), #secret.replace("-", "_").upper(), - ) def printSecrets(filename, env, secretEnv): return { "name": "print secrets", From 9d4b012ae9e43f96a6b06630acabecf85218d08c Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:44:08 +0100 Subject: [PATCH 131/155] . --- .drone.star | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/.drone.star b/.drone.star index 4c9199a..a4f5937 100644 --- a/.drone.star +++ b/.drone.star @@ -1,29 +1,12 @@ load("@this//:from-secret.star", "fromSecret") load("@this//:print-secrets.star", "printSecrets") -def environment(env): - return dict( - [(x.replace("-", "_").upper(), fromSecret(x)) for x in env] - ) -def map(fn, l): - return [fn(x) for x in l] -def secretToEnvironment(secret): - return secret.replace("-", "_").upper() -def echo(secret): - return 'echo "export {environment}=${environment}" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper(), - ) -def echoSecret(secret): - return 'echo "export {environment}=???" >> ***filename*** # {secret}'.format( - secret = secret, - environment = secret.replace("-", "_").upper() - ) +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") -def export(secret): - return "export {toCaps}=${toCaps}".format( - toCaps = secretToEnvironment(secret), - ) def wait(delay, name): return { "name": name, From 345d8e503ce71181bb8284e5042932cb26455771 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:53:02 +0100 Subject: [PATCH 132/155] . --- drone-starlark/repos/build.star | 21 +++++++++++++++++++++ drone-starlark/repos/scp.star | 25 +++++++++++++++++++++++++ drone-starlark/repos/wait.star | 8 ++++++++ 3 files changed, 54 insertions(+) create mode 100644 drone-starlark/repos/build.star create mode 100644 drone-starlark/repos/scp.star create mode 100644 drone-starlark/repos/wait.star diff --git a/drone-starlark/repos/build.star b/drone-starlark/repos/build.star new file mode 100644 index 0000000..827c7ab --- /dev/null +++ b/drone-starlark/repos/build.star @@ -0,0 +1,21 @@ +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", + ]), + "commands": [ + "cd {name}".format(name=name), + "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), + "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), + ], + } diff --git a/drone-starlark/repos/scp.star b/drone-starlark/repos/scp.star new file mode 100644 index 0000000..f0b4c6f --- /dev/null +++ b/drone-starlark/repos/scp.star @@ -0,0 +1,25 @@ +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": [ + ".", + ], + }, + } + \ No newline at end of file diff --git a/drone-starlark/repos/wait.star b/drone-starlark/repos/wait.star new file mode 100644 index 0000000..021bc8c --- /dev/null +++ b/drone-starlark/repos/wait.star @@ -0,0 +1,8 @@ +def wait(delay, name): + return { + "name": name, + "image": "alpine", + "commands": [ + "sleep {delay}".format(delay = delay), + ], + } From 724fdc584ad98c4dfa4f156d1b58998d95f739fb Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 14:58:26 +0100 Subject: [PATCH 133/155] . --- .drone.star | 54 +++-------------------------------------------------- 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/.drone.star b/.drone.star index a4f5937..51962f7 100644 --- a/.drone.star +++ b/.drone.star @@ -6,34 +6,10 @@ 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") -def wait(delay, name): - return { - "name": name, - "image": "alpine", - "commands": [ - "sleep {delay}".format(delay = delay), - ], - } -def build(name): - return { - "name": "build-{name}".format(name=name), - "image": "docker:dind", - "volumes": [ - { - "name": "dockersock", - "path": "/var/run", - }, - ], - "environment": environment([ - "local-docker-registry", - ]), - "commands": [ - "cd {name}".format(name=name), - "docker build . -t $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), - "docker push $${{LOCAL_DOCKER_REGISTRY}}{name}".format(name=name), - ], - } def buildHome(): return { "name": "build-nginx-home", @@ -72,30 +48,6 @@ def buildNginx(name): ], } -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": [ - ".", - ], - }, - } def deploy( filename, folder, From e826c52635755fe78adba2096d119dc83c5e15df Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 16:57:28 +0100 Subject: [PATCH 134/155] . --- drone-starlark/repos/secrets.star | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 drone-starlark/repos/secrets.star diff --git a/drone-starlark/repos/secrets.star b/drone-starlark/repos/secrets.star new file mode 100644 index 0000000..97bd33d --- /dev/null +++ b/drone-starlark/repos/secrets.star @@ -0,0 +1,16 @@ +secrets = [ + "drone-rpc-secret", + "drone-gitea-client-id", + "drone-gitea-client-secret", + "drone-gitea-server", + "drone-convert-secret", + "ssh-user", + "local-docker-registry", + "certbot-email", + "git-domain", + "drone-domain", + "chat-domain", + "remote-domain", + "blog-domain", + ] + \ No newline at end of file From 180415b0a54833aab747c0c0087a73c07a4c96d3 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 17:05:09 +0100 Subject: [PATCH 135/155] . --- drone-starlark/repos/public-secrets.star | 12 ++++++++++++ drone-starlark/repos/secret-secrets.star | 5 +++++ drone-starlark/repos/secrets.star | 16 ---------------- 3 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 drone-starlark/repos/public-secrets.star create mode 100644 drone-starlark/repos/secret-secrets.star delete mode 100644 drone-starlark/repos/secrets.star diff --git a/drone-starlark/repos/public-secrets.star b/drone-starlark/repos/public-secrets.star new file mode 100644 index 0000000..dd081f0 --- /dev/null +++ b/drone-starlark/repos/public-secrets.star @@ -0,0 +1,12 @@ +publicSecrets = [ + "blog-domain", + "certbot-email", + "chat-domain", + "drone-domain", + "drone-gitea-client-id", + "drone-gitea-server", + "git-domain", + "local-docker-registry", + "remote-domain", + "ssh-user", +] \ No newline at end of file diff --git a/drone-starlark/repos/secret-secrets.star b/drone-starlark/repos/secret-secrets.star new file mode 100644 index 0000000..2e04f61 --- /dev/null +++ b/drone-starlark/repos/secret-secrets.star @@ -0,0 +1,5 @@ +secretSecrets = [ + "drone-convert-secret", + "drone-gitea-client-secret", + "drone-rpc-secret", +] \ No newline at end of file diff --git a/drone-starlark/repos/secrets.star b/drone-starlark/repos/secrets.star deleted file mode 100644 index 97bd33d..0000000 --- a/drone-starlark/repos/secrets.star +++ /dev/null @@ -1,16 +0,0 @@ -secrets = [ - "drone-rpc-secret", - "drone-gitea-client-id", - "drone-gitea-client-secret", - "drone-gitea-server", - "drone-convert-secret", - "ssh-user", - "local-docker-registry", - "certbot-email", - "git-domain", - "drone-domain", - "chat-domain", - "remote-domain", - "blog-domain", - ] - \ No newline at end of file From e8e449164755da25a2405677ed594af4b2d257a8 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 17:11:26 +0100 Subject: [PATCH 136/155] . --- .drone.star | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/.drone.star b/.drone.star index 51962f7..799ad60 100644 --- a/.drone.star +++ b/.drone.star @@ -9,6 +9,8 @@ load("@this//:echo-secret.star", "echoSecret") load("@this//:wait.star", "wait") load("@this//:build.star", "build") load("@this//:scp.star", "scp") +load("@this//:public-secrets.star", "publicSecrets") +load("@this//:secret-secrets.star", "secretSecrets") def buildHome(): return { @@ -52,25 +54,10 @@ def deploy( filename, folder, ): - secrets = [ - "drone-rpc-secret", - "drone-gitea-client-id", - "drone-gitea-client-secret", - "drone-gitea-server", - "drone-convert-secret", - "ssh-user", - "local-docker-registry", - "certbot-email", - "git-domain", - "drone-domain", - "chat-domain", - "remote-domain", - "blog-domain", - ] return { "name": "deploy", "image": "appleboy/drone-ssh", - "environment": environment(secrets), + "environment": environment(publicSecrets + secretSecrets), "settings": { "envs": [x.replace("-", "_") for x in secrets ], "host": fromSecret("ssh-host"), @@ -79,7 +66,7 @@ def deploy( "password": fromSecret("ssh-root-password"), "script": [ "set -e" - ] + map(export, secrets) + [ + ] + map(export, publicSecrets + secretSecrets) + [ "echo {folder}".format(folder=folder), "cd {folder}".format(folder=folder), "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-git", @@ -105,23 +92,8 @@ def pipeline(name, steps, dependsOn): "steps": [ printSecrets( "env-stack", - [ - "blog-domain", - "certbot-email", - "chat-domain", - "drone-domain", - "drone-gitea-client-id", - "drone-gitea-server", - "git-domain", - "local-docker-registry", - "remote-domain", - "ssh-user", - ], - [ - "drone-convert-secret", - "drone-gitea-client-secret", - "drone-rpc-secret", - ], + publicSecrets, + secretSecrets, ), wait(15, "wait"), ] + steps, From 494b6ca9a19bce4288d38c73a5d96e5259cb1f99 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 17:12:48 +0100 Subject: [PATCH 137/155] . --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 799ad60..8a90344 100644 --- a/.drone.star +++ b/.drone.star @@ -59,7 +59,7 @@ def deploy( "image": "appleboy/drone-ssh", "environment": environment(publicSecrets + secretSecrets), "settings": { - "envs": [x.replace("-", "_") for x in secrets ], + "envs": [x.replace("-", "_") for x in publicSecrets + secretSecrets ], "host": fromSecret("ssh-host"), "port": fromSecret("ssh-port"), "username": fromSecret("ssh-root-user"), From 474fefeab431ef4c86c5e714010e95cbf771cede Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 17:37:22 +0100 Subject: [PATCH 138/155] . --- .drone.star | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/.drone.star b/.drone.star index 8a90344..ed04d1d 100644 --- a/.drone.star +++ b/.drone.star @@ -53,7 +53,16 @@ def buildNginx(name): def deploy( filename, folder, -): +): + images = [ + "letsencrypt-git", + "letsencrypt-chat", + "letsencrypt-drone", + "letsencrypt-remote", + "letsencrypt-blog", + "nginx-home1", + "drone-starlark", + ] return { "name": "deploy", "image": "appleboy/drone-ssh", @@ -66,16 +75,10 @@ def deploy( "password": fromSecret("ssh-root-password"), "script": [ "set -e" - ] + map(export, publicSecrets + secretSecrets) + [ - "echo {folder}".format(folder=folder), - "cd {folder}".format(folder=folder), - "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-git", - "docker pull $${LOCAL_DOCKER_REGISTRY}nginx-home1", - "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-chat", - "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-remote", - "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-blog", - "docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", - "docker pull $${LOCAL_DOCKER_REGISTRY}drone-starlark", + ] + + map(export, publicSecrets + secretSecrets) + + ["docker pull $${{LOCAL_DOCKER_REGISTRY}}{image}".format(image=image) for image in images ] + + [ "docker network prune -f", "cd {folder}".format(folder=folder), "docker stack rm gitea", From a085434a14166b64621447238b43fae0b58de658 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 17:44:57 +0100 Subject: [PATCH 139/155] . --- .drone.star | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/.drone.star b/.drone.star index ed04d1d..ce96639 100644 --- a/.drone.star +++ b/.drone.star @@ -49,20 +49,32 @@ def buildNginx(name): "sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name), ], } +def pull( + images, +): + secrets = [ " local-docker-registry"] + return { + "name": "pull", + "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 pull $${{LOCAL_DOCKER_REGISTRY}}{image}".format(image=image) for image in images ] + } + } def deploy( filename, folder, ): - images = [ - "letsencrypt-git", - "letsencrypt-chat", - "letsencrypt-drone", - "letsencrypt-remote", - "letsencrypt-blog", - "nginx-home1", - "drone-starlark", - ] return { "name": "deploy", "image": "appleboy/drone-ssh", @@ -77,7 +89,6 @@ def deploy( "set -e" ] + map(export, publicSecrets + secretSecrets) + - ["docker pull $${{LOCAL_DOCKER_REGISTRY}}{image}".format(image=image) for image in images ] + [ "docker network prune -f", "cd {folder}".format(folder=folder), @@ -148,6 +159,15 @@ def main(ctx): #buildNginx("remote"), #buildNginx("chat"), scp("~/gitea-drone-stack"), + pull([ + "letsencrypt-git", + "letsencrypt-chat", + "letsencrypt-drone", + "letsencrypt-remote", + "letsencrypt-blog", + "nginx-home1", + "drone-starlark", + ]), deploy( "docker-compose-home.yml", "/home/giles/gitea-drone-stack", From 28d8b22815e2657dede84c0cdb8ed7d9f91cd7e3 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 18:00:45 +0100 Subject: [PATCH 140/155] . --- .drone.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index ce96639..72b7b5b 100644 --- a/.drone.star +++ b/.drone.star @@ -52,7 +52,7 @@ def buildNginx(name): def pull( images, ): - secrets = [ " local-docker-registry"] + secrets = [ "local-docker-registry"] return { "name": "pull", "image": "appleboy/drone-ssh", @@ -151,7 +151,7 @@ def main(ctx): #build("guacamole-postgresql"), #build("ngrok-gitea"), #build("letsencrypt-nginx"), - build("drone-starlark"), + #build("drone-starlark"), #buildHome(), #buildNginx("blog"), #buildNginx("drone"), From 9db1dbb3490612e116298f7b811b3756fc6e7ae9 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 18:06:31 +0100 Subject: [PATCH 141/155] . --- .drone.star | 2 +- drone-starlark/repos/deploy.star | 34 ++++++++++++++++++++++++++++++++ drone-starlark/repos/pull.star | 26 ++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 drone-starlark/repos/deploy.star create mode 100644 drone-starlark/repos/pull.star diff --git a/.drone.star b/.drone.star index 72b7b5b..285f1af 100644 --- a/.drone.star +++ b/.drone.star @@ -151,7 +151,7 @@ def main(ctx): #build("guacamole-postgresql"), #build("ngrok-gitea"), #build("letsencrypt-nginx"), - #build("drone-starlark"), + build("drone-starlark"), #buildHome(), #buildNginx("blog"), #buildNginx("drone"), diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star new file mode 100644 index 0000000..f2a2a64 --- /dev/null +++ b/drone-starlark/repos/deploy.star @@ -0,0 +1,34 @@ +load("@this//:from-secret.star", "fromSecret") +load("@this//:map.star", "map") +load("@this//:environment.star", "environment") +load("@this//:export.star", "export") +load("@this//:public-secrets.star", "publicSecrets") +load("@this//:secret-secrets.star", "secretSecrets") + +def deploy( + filename, + folder, +): + return { + "name": "deploy", + "image": "appleboy/drone-ssh", + "environment": environment(publicSecrets + secretSecrets), + "settings": { + "envs": [x.replace("-", "_") for x in publicSecrets + secretSecrets ], + "host": fromSecret("ssh-host"), + "port": fromSecret("ssh-port"), + "username": fromSecret("ssh-root-user"), + "password": fromSecret("ssh-root-password"), + "script": [ + "set -e" + ] + + map(export, publicSecrets + secretSecrets) + + [ + "docker network prune -f", + "cd {folder}".format(folder=folder), + "docker stack rm gitea", + "sleep 30", + "docker stack deploy -c {filename} gitea".format(filename = filename), + ] + } + } diff --git a/drone-starlark/repos/pull.star b/drone-starlark/repos/pull.star new file mode 100644 index 0000000..2b74bdb --- /dev/null +++ b/drone-starlark/repos/pull.star @@ -0,0 +1,26 @@ +load("@this//:from-secret.star", "fromSecret") +load("@this//:map.star", "map") +load("@this//:environment.star", "environment") +load("@this//:export.star", "export") + +def pull( + images, +): + secrets = [ "local-docker-registry"] + return { + "name": "pull", + "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 pull $${{LOCAL_DOCKER_REGISTRY}}{image}".format(image=image) for image in images ] + } + } From d50fea98e5f1dc66068839d2c095480bcd96b4df Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Sun, 26 Apr 2020 18:10:20 +0100 Subject: [PATCH 142/155] . --- .drone.star | 51 ++------------------------------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/.drone.star b/.drone.star index 285f1af..2573d16 100644 --- a/.drone.star +++ b/.drone.star @@ -11,6 +11,8 @@ load("@this//:build.star", "build") load("@this//:scp.star", "scp") load("@this//:public-secrets.star", "publicSecrets") load("@this//:secret-secrets.star", "secretSecrets") +load("@this//:pull.star", "pull") +load("@this//:deploy.star", "deploy") def buildHome(): return { @@ -49,55 +51,6 @@ def buildNginx(name): "sh build.sh {name} $${{LOCAL_DOCKER_REGISTRY}}".format(name = name), ], } -def pull( - images, -): - secrets = [ "local-docker-registry"] - return { - "name": "pull", - "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 pull $${{LOCAL_DOCKER_REGISTRY}}{image}".format(image=image) for image in images ] - } - } - -def deploy( - filename, - folder, -): - return { - "name": "deploy", - "image": "appleboy/drone-ssh", - "environment": environment(publicSecrets + secretSecrets), - "settings": { - "envs": [x.replace("-", "_") for x in publicSecrets + secretSecrets ], - "host": fromSecret("ssh-host"), - "port": fromSecret("ssh-port"), - "username": fromSecret("ssh-root-user"), - "password": fromSecret("ssh-root-password"), - "script": [ - "set -e" - ] + - map(export, publicSecrets + secretSecrets) + - [ - "docker network prune -f", - "cd {folder}".format(folder=folder), - "docker stack rm gitea", - "sleep 30", - "docker stack deploy -c {filename} gitea".format(filename = filename), - ] - } - } def pipeline(name, steps, dependsOn): return { "kind": "pipeline", From 4ec0561d23ef759a2779fd75a258c6b39aaff8e0 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 11:32:43 +0100 Subject: [PATCH 143/155] . --- thedate | 1 - 1 file changed, 1 deletion(-) delete mode 100644 thedate diff --git a/thedate b/thedate deleted file mode 100644 index dfc28f6..0000000 --- a/thedate +++ /dev/null @@ -1 +0,0 @@ -Fri 24 Apr 2020 12:59:50 PM BST From 9ae47cfcb7849ee63b19c9129027fabc858050f6 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 11:41:24 +0100 Subject: [PATCH 144/155] . --- .drone.do.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.drone.do.yml b/.drone.do.yml index 33a1ea4..9e89c1d 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -104,6 +104,21 @@ steps: - cd guacamole-postgresql - docker build . -t $${LOCAL_DOCKER_REGISTRY}guacamole-postgresql - docker push $${LOCAL_DOCKER_REGISTRY}guacamole-postgresql +- name: build-drone-starlark + when: + branch: + - do + image: docker:dind + volumes: + - name: dockersock + path: /var/run + environment: + LOCAL_DOCKER_REGISTRY: + from_secret: local-docker-registry + commands: + - cd drone-starlark + - docker build . -t $${LOCAL_DOCKER_REGISTRY}drone-starlark + - docker push $${LOCAL_DOCKER_REGISTRY}drone-starlark - name: clear when: @@ -115,6 +130,8 @@ steps: from_secret: ssh-host username: from_secret: ssh-user + password: + from_secret: ssh-password key: from_secret: ssh-key passphrase: @@ -133,6 +150,8 @@ steps: from_secret: ssh-host username: from_secret: ssh-user + password: + from_secret: ssh-password key: from_secret: ssh-key passphrase: From 363d61a087c1f0995bc7718e33c362f531ac78b1 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 11:45:10 +0100 Subject: [PATCH 145/155] . --- .drone.do.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.drone.do.yml b/.drone.do.yml index 9e89c1d..fb783dc 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -134,10 +134,10 @@ steps: from_secret: ssh-password key: from_secret: ssh-key - passphrase: - from_secret: ssh-passphrase - port: - from_secret: ssh-port + #passphrase: + # from_secret: ssh-passphrase + #port: + # from_secret: ssh-port script: - rm -r -f ~/stack-deploy - name: scp files @@ -152,10 +152,10 @@ steps: from_secret: ssh-user password: from_secret: ssh-password - key: - from_secret: ssh-key - passphrase: - from_secret: ssh-passphrase + #key: + # from_secret: ssh-key + #passphrase: + # from_secret: ssh-passphrase port: from_secret: ssh-port command_timeout: 2m @@ -204,10 +204,12 @@ steps: from_secret: ssh-host username: from_secret: ssh-user - key: - from_secret: ssh-key - passphrase: - from_secret: ssh-passphrase + password: + from_secret: ssh-password + #key: + # from_secret: ssh-key + #passphrase: + # from_secret: ssh-passphrase port: from_secret: ssh-port script: @@ -226,6 +228,7 @@ steps: - cd ~/stack-deploy - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-do - docker pull $${LOCAL_DOCKER_REGISTRY}guacamole-postgresql + - docker pull $${LOCAL_DOCKER_REGISTRY}drone-starlark - docker stack rm gitea - sleep 60 - docker stack deploy -c docker-compose-do.yml gitea From 3b6db5d6eb3addd08210268149c561d57ce65350 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 11:51:24 +0100 Subject: [PATCH 146/155] . --- .drone.do.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.drone.do.yml b/.drone.do.yml index fb783dc..e32ec57 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -49,6 +49,26 @@ steps: - echo LOCAL_DOCKER_REGISTRY=$LOCAL_DOCKER_REGISTRY >> env - echo CERTBOT_EMAIL=$CERTBOT_EMAIL >> env - echo GIT_DOMAIN=$GIT_DOMAIN >> env +- name: clear + when: + branch: + - do + image: appleboy/drone-ssh + settings: + host: + from_secret: ssh-host + username: + from_secret: ssh-user + password: + from_secret: ssh-password + key: + from_secret: ssh-key + #passphrase: + # from_secret: ssh-passphrase + #port: + # from_secret: ssh-port + script: + - rm -r -f ~/stack-deploy - name: wait when: branch: @@ -120,26 +140,6 @@ steps: - docker build . -t $${LOCAL_DOCKER_REGISTRY}drone-starlark - docker push $${LOCAL_DOCKER_REGISTRY}drone-starlark -- name: clear - when: - branch: - - do - image: appleboy/drone-ssh - settings: - host: - from_secret: ssh-host - username: - from_secret: ssh-user - password: - from_secret: ssh-password - key: - from_secret: ssh-key - #passphrase: - # from_secret: ssh-passphrase - #port: - # from_secret: ssh-port - script: - - rm -r -f ~/stack-deploy - name: scp files when: branch: From f757040c71e3c7ce29b50ed47104171fe5e8fc14 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 11:57:28 +0100 Subject: [PATCH 147/155] . --- .drone.do.yml | 12 ++++++++---- docker-compose-do.yml | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/.drone.do.yml b/.drone.do.yml index e32ec57..43f625d 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -61,12 +61,12 @@ steps: from_secret: ssh-user password: from_secret: ssh-password - key: - from_secret: ssh-key + #key: + # from_secret: ssh-key #passphrase: # from_secret: ssh-passphrase - #port: - # from_secret: ssh-port + port: + from_secret: ssh-port script: - rm -r -f ~/stack-deploy - name: wait @@ -174,6 +174,8 @@ steps: from_secret: drone-gitea-client-id DRONE_GITEA_CLIENT_SECRET: from_secret: drone-gitea-client-secret + DRONE_CONVERT_SECRET: + from_secret: drone-convert-secret LOCAL_DOCKER_REGISTRY: from_secret: local-docker-registry SSH_USER: @@ -193,6 +195,7 @@ steps: - drone_rpc_secret - drone_gitea_client_id - drone_gitea_client_secret + - drone_convert_secret - ssh_user - local_docker_registry - certbot_email @@ -224,6 +227,7 @@ steps: - export GUACAMOLE_POSTGRES_USER=$GUACAMOLE_POSTGRES_USER - export GUACAMOLE_POSTGRES_DB=$GUACAMOLE_POSTGRES_DB - export GUACAMOLE_POSTGRES_PASSWORD=$GUACAMOLE_POSTGRES_PASSWORD + - export DRONE_CONVERT_SECRET=$DRONE_CONVERT_SECRET - docker network prune -f - cd ~/stack-deploy - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-do diff --git a/docker-compose-do.yml b/docker-compose-do.yml index 3ed9215..db0e8bd 100644 --- a/docker-compose-do.yml +++ b/docker-compose-do.yml @@ -125,6 +125,8 @@ services: - DRONE_RPC_SECRET=${DRONE_RPC_SECRET} - DRONE_USER_CREATE=username:giles,admin:true - DRONE_AGENTS_ENABLED=true + - DRONE_CONVERT_PLUGIN_ENDPOINT=http://drone-starlark:3000 + - DRONE_CONVERT_PLUGIN_SECRET=${DRONE_CONVERT_SECRET} #- DRONE_ENV_PLUGIN_ENDPOINT=http://git.local-domain:8888 #- DRONE_ENV_PLUGIN_TOKEN=anything networks: @@ -149,6 +151,20 @@ services: - DRONE_RUNNER_NAME="docker-runner" #- DRONE_ENV_PLUGIN_ENDPOINT=http://git.local-domain:8888 #- DRONE_ENV_PLUGIN_TOKEN=anything + drone-starlark: + deploy: + placement: + constraints: [node.labels.com.sigyl.git-stack == yes] + replicas: 1 + restart_policy: + condition: any + image: ${LOCAL_DOCKER_REGISTRY}drone-starlark + environment: + - DRONE_DEBUG=true + - DRONE_SECRET=${DRONE_CONVERT_SECRET} + - DRONE_STARLARK_REPO_PATHS=this:/repos + networks: + - appnet registry: deploy: placement: From 651bf46d990f0c41386bdb896161bf9517db8f3e Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 12:02:46 +0100 Subject: [PATCH 148/155] . --- .drone.do.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.do.yml b/.drone.do.yml index 43f625d..fee8385 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -52,7 +52,7 @@ steps: - name: clear when: branch: - - do + - do-skip image: appleboy/drone-ssh settings: host: @@ -72,7 +72,7 @@ steps: - name: wait when: branch: - - do + - do-skip image: docker:dind volumes: - name: dockersock @@ -83,7 +83,7 @@ steps: - name: build-letsencrypt-nginx when: branch: - - do + - do-skip image: docker:dind volumes: - name: dockersock @@ -98,7 +98,7 @@ steps: - name: build-letsencrypt-do when: branch: - - do + - do-skip image: docker:dind volumes: - name: dockersock @@ -112,7 +112,7 @@ steps: - name: build-postgres when: branch: - - do + - do-skip image: docker:dind volumes: - name: dockersock @@ -127,7 +127,7 @@ steps: - name: build-drone-starlark when: branch: - - do + - do-skip image: docker:dind volumes: - name: dockersock @@ -152,10 +152,10 @@ steps: from_secret: ssh-user password: from_secret: ssh-password - #key: - # from_secret: ssh-key - #passphrase: - # from_secret: ssh-passphrase + key: + from_secret: ssh-key + passphrase: + from_secret: ssh-passphrase port: from_secret: ssh-port command_timeout: 2m From 521170b5d4eacf5a966ad25ea80afeae7384c14c Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 12:03:50 +0100 Subject: [PATCH 149/155] . --- .drone.do.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.do.yml b/.drone.do.yml index fee8385..8b958da 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -150,8 +150,8 @@ steps: from_secret: ssh-host username: from_secret: ssh-user - password: - from_secret: ssh-password + #password: + # from_secret: ssh-password key: from_secret: ssh-key passphrase: From 7b36c1db66f2e1681f8283920f3be4361003c3ed Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 12:10:46 +0100 Subject: [PATCH 151/155] . --- .drone.do.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.drone.do.yml b/.drone.do.yml index 8b958da..941a06d 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -150,12 +150,12 @@ steps: from_secret: ssh-host username: from_secret: ssh-user - #password: - # from_secret: ssh-password - key: - from_secret: ssh-key - passphrase: - from_secret: ssh-passphrase + password: + from_secret: ssh-password + #key: + # from_secret: ssh-key + #passphrase: + # from_secret: ssh-passphrase port: from_secret: ssh-port command_timeout: 2m From a1dbf55d24d9139616a9f767fbd685f1d6a207bb Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 12:11:52 +0100 Subject: [PATCH 152/155] . --- .drone.do.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.do.yml b/.drone.do.yml index 941a06d..92cec2b 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -159,7 +159,7 @@ steps: port: from_secret: ssh-port command_timeout: 2m - target: ~/stack-deploy + target: /home/giles/stack-deploy source: - . - name: deploy From 96a8d55c868073b9a23801027b0080cec4facc87 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 12:12:28 +0100 Subject: [PATCH 153/155] . --- .drone.do.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.do.yml b/.drone.do.yml index 92cec2b..bfaccd6 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -68,7 +68,7 @@ steps: port: from_secret: ssh-port script: - - rm -r -f ~/stack-deploy + - rm -r -f /home/giles/stack-deploy - name: wait when: branch: From 73caf2ca7a91cde5c7ae01c075887785a89b211e Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 12:14:26 +0100 Subject: [PATCH 154/155] . --- .drone.do.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.do.yml b/.drone.do.yml index bfaccd6..0d0389c 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -52,7 +52,7 @@ steps: - name: clear when: branch: - - do-skip + - do image: appleboy/drone-ssh settings: host: From 717044d82fafe72381c7070572f5054594e1acf7 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Mon, 27 Apr 2020 13:02:15 +0100 Subject: [PATCH 155/155] . --- .drone.do.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.do.yml b/.drone.do.yml index 0d0389c..cb1fdc7 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -72,7 +72,7 @@ steps: - name: wait when: branch: - - do-skip + - do image: docker:dind volumes: - name: dockersock @@ -83,7 +83,7 @@ steps: - name: build-letsencrypt-nginx when: branch: - - do-skip + - do image: docker:dind volumes: - name: dockersock @@ -98,7 +98,7 @@ steps: - name: build-letsencrypt-do when: branch: - - do-skip + - do image: docker:dind volumes: - name: dockersock @@ -112,7 +112,7 @@ steps: - name: build-postgres when: branch: - - do-skip + - do image: docker:dind volumes: - name: dockersock @@ -127,7 +127,7 @@ steps: - name: build-drone-starlark when: branch: - - do-skip + - do image: docker:dind volumes: - name: dockersock @@ -150,12 +150,12 @@ steps: from_secret: ssh-host username: from_secret: ssh-user - password: - from_secret: ssh-password - #key: - # from_secret: ssh-key - #passphrase: - # from_secret: ssh-passphrase + #password: + # from_secret: ssh-password + key: + from_secret: ssh-key + passphrase: + from_secret: ssh-passphrase port: from_secret: ssh-port command_timeout: 2m