From 58f92e375c67321a3e4ccd928db672f751057723 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Tue, 14 Apr 2020 16:18:58 +0200 Subject: [PATCH] Move to new v2 format --- README.md | 5 +--- ansible/.vault.sh | 5 ---- ansible/post-deploy.yml | 40 ---------------------------- ansible/pre-deploy.yml | 35 ------------------------ ansible/requirements.yml | 6 ----- ansible/vars/all.yml | 4 --- ansible/vars/ansible_become_pass.yml | 8 ------ ansible/vars/rpc_secret.yml | 9 ------- app.json | 5 ---- deploy.d/config.yml | 18 +++++++++++++ deploy.d/vault/rpc_secret.yml | 9 +++++++ requirements.txt | 1 - sbin/encrypt.sh | 15 ----------- 13 files changed, 28 insertions(+), 132 deletions(-) delete mode 100755 ansible/.vault.sh delete mode 100644 ansible/post-deploy.yml delete mode 100644 ansible/pre-deploy.yml delete mode 100644 ansible/requirements.yml delete mode 100644 ansible/vars/all.yml delete mode 100644 ansible/vars/ansible_become_pass.yml delete mode 100644 ansible/vars/rpc_secret.yml delete mode 100644 app.json create mode 100644 deploy.d/config.yml create mode 100644 deploy.d/vault/rpc_secret.yml delete mode 100644 requirements.txt delete mode 100755 sbin/encrypt.sh diff --git a/README.md b/README.md index c27d523..3eaee76 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,4 @@ > https://drone.io/ -# Deploy - -1. Push your changes to master and Dokku will try to automatically release -1. See the [dashboard to see the build](https://drone.autonomic.zone/autonomic-cooperative/drone-docker-runner/) +> https://drone-docker-runner.autonomic.zone diff --git a/ansible/.vault.sh b/ansible/.vault.sh deleted file mode 100755 index 8f30d37..0000000 --- a/ansible/.vault.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -eu -o pipefail - -echo $(pass show hosts/autonomic-dokku/vault/password) diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml deleted file mode 100644 index a8c1315..0000000 --- a/ansible/post-deploy.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- hosts: all - gather_facts: false - tasks: - - name: Load variables - include_vars: - dir: "{{ dokku_lib_root }}/data/ansible/drone-docker-runner/vars/" - extensions: - - yml - - - name: Set HTTP 80 port proxy - dokku_ports: - app: drone-docker-runner - mappings: - - "http:80:3000" - state: present - - - name: Setup LE certificates - shell: dokku letsencrypt drone-docker-runner - args: - creates: /home/dokku/drone-docker-runner/letsencrypt/certs - - - name: Setup LE certificates renew cron job - shell: dokku letsencrypt:cron-job --add - args: - creates: /home/dokku/drone-docker-runner/letsencrypt/cron-job - - - name: Remove automatically configured ports - dokku_ports: - app: drone-docker-runner - mappings: - - "http:3000:3000" - state: absent - - - name: Set HTTP 443 port - dokku_ports: - app: drone-docker-runner - mappings: - - "https:443:3000" - state: present diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml deleted file mode 100644 index 331a407..0000000 --- a/ansible/pre-deploy.yml +++ /dev/null @@ -1,35 +0,0 @@ ---- -- hosts: all - gather_facts: false - tasks: - - name: Load variables - include_vars: - dir: "{{ dokku_lib_root }}/data/ansible/drone-docker-runner/vars/" - extensions: - - yml - - - name: "Configure {{ domain }} domain" - dokku_domains: - app: drone-docker-runner - domains: - - "{{ domain }}" - state: present - - - name: Specify docker volume mount - dokku_storage: - app: drone-docker-runner - mounts: - - /var/run/docker.sock:/var/run/docker.sock - - - name: Configure the app environment - dokku_config: - app: drone-docker-runner - restart: false - config: - DOKKU_LETSENCRYPT_EMAIL: "{{ autonomic_admin_mail }}" - DRONE_RPC_HOST: "{{ drone_domain }}" - DRONE_RPC_PROTO: "https" - DRONE_RPC_SECRET: "{{ rpc_secret }}" - DRONE_RUNNER_CAPACITY: "4" - DRONE_RUNNER_NAME: "drone-docker-runner" - DRONE_RUNNER_VOLUMES: "/var/run/docker.sock:/var/run/docker.sock" diff --git a/ansible/requirements.yml b/ansible/requirements.yml deleted file mode 100644 index e2e3214..0000000 --- a/ansible/requirements.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- src: dokku_bot.ansible_dokku - version: v2020.3.24 - -- src: https://git.coop/decentral1se/autonomic.gandi/-/archive/0.0.5/autonomic.gandi-0.0.5.tar.gz - name: autonomic.gandi diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml deleted file mode 100644 index 8904e62..0000000 --- a/ansible/vars/all.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -domain: "drone-docker-runner.autonomic.zone" -autonomic_admin_mail: "helo@autonomic.zone" -drone_domain: "drone.autonomic.zone" diff --git a/ansible/vars/ansible_become_pass.yml b/ansible/vars/ansible_become_pass.yml deleted file mode 100644 index abb21b9..0000000 --- a/ansible/vars/ansible_become_pass.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -ansible_become_pass: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 34396236353735666531323238656533643465303131663464613162396333313836363630666266 - 6539323631656635333864316166633064633366323936610a656137616334313534333635313232 - 35323561303763366563316631313638363333393763323935343563303963616334336639386462 - 3837383830616637360a373539613630356564363662393836366462666430353439353637303035 - 63396633303166343433313439303539313637306637663137313533316531616434 diff --git a/ansible/vars/rpc_secret.yml b/ansible/vars/rpc_secret.yml deleted file mode 100644 index ef653ca..0000000 --- a/ansible/vars/rpc_secret.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -rpc_secret: !vault | - $ANSIBLE_VAULT;1.1;AES256 - 33346331663332396364613536313365316561616465656465653330646139333039326130336632 - 3931353462663631393536646266396237373735323433610a306632396237656133343963653530 - 34626237393165643464666133653731346335636261623935333134343137343135326334373135 - 6430653839636632350a643330666236636633336665306564303166343133396562643465373761 - 31633636326335316661313039383135366230356339376632313063386431343434633363366466 - 6530363438643965373030656537663533666236376232336162 diff --git a/app.json b/app.json deleted file mode 100644 index 66e0804..0000000 --- a/app.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "drone-docker-runner", - "description": "Docker based build runner for the Drone controller", - "repository": "https://git.autonomic.zone/autonomic-cooperative/drone-docker-runner" -} diff --git a/deploy.d/config.yml b/deploy.d/config.yml new file mode 100644 index 0000000..66f05e7 --- /dev/null +++ b/deploy.d/config.yml @@ -0,0 +1,18 @@ +--- +vars: + port: "3000" + domain: "drone-docker-runner.autonomic.zone" + +volumes: + - type: file + src: /var/run/docker.sock + dest: /var/run/docker.sock + +env: + DOKKU_LETSENCRYPT_EMAIL: "helo@autonomic.zone" + DRONE_RPC_HOST: "drone.autonomic.zone" + DRONE_RPC_PROTO: "https" + DRONE_RPC_SECRET: "{{ vault.rpc_secret }}" + DRONE_RUNNER_CAPACITY: "4" + DRONE_RUNNER_NAME: "drone-docker-runner" + DRONE_RUNNER_VOLUMES: "/var/run/docker.sock:/var/run/docker.sock" diff --git a/deploy.d/vault/rpc_secret.yml b/deploy.d/vault/rpc_secret.yml new file mode 100644 index 0000000..18faef3 --- /dev/null +++ b/deploy.d/vault/rpc_secret.yml @@ -0,0 +1,9 @@ +--- +rpc_secret: !vault |- + $ANSIBLE_VAULT;1.1;AES256 + 30383961383637336366373331383662613062393937313864363331366264396266643538633536 + 6666633634636335386532656238333631653334663130610a623936626139353965616666393834 + 31663930373264346665616337326533316337653330323635316463376663393334323733613963 + 6466373137326435630a313831363030636439383861623666383366316466396463616565633432 + 66633835636161656439353035373630616537386262613136373662623339623831623766613436 + 6330626239366536626438396536373836353035346262623230 diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 130e91f..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -ansible==2.9.6 diff --git a/sbin/encrypt.sh b/sbin/encrypt.sh deleted file mode 100755 index d328761..0000000 --- a/sbin/encrypt.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -set -eu -o pipefail - -# Usage -# ./encrypt.sh mysecretname mysecretvalue - -declare name="$1" -declare secret="$2" - -ansible-vault \ - encrypt_string \ - --vault-password-file ansible/.vault.sh \ - --name "$name" \ - "$secret"