From 635b38b2275880daed766b8687e39d9d46439758 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Thu, 19 Jan 2023 16:02:27 -0800 Subject: [PATCH 1/5] Update abra syntax in examples (finally) [mass update] --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aafb291..4659b5b 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ Bot to play youtube / soundcloud / radio / local music on Mumble 2. Deploy [`coop-cloud/traefik`] 3. `abra app new botamusique --secrets` (optionally with `--pass` if you'd like to save secrets in `pass`) -4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to +4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to your Docker swarm box -5. `abra app YOURAPPDOMAIN deploy` +5. `abra app deploy YOURAPPDOMAIN` 6. Open the configured domain in your browser to finish set-up NB you currently need to manually generate a certificate: From 6060ae324cfa7d4b41ef17e2ffc42618b3345125 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 10:45:03 -0800 Subject: [PATCH 2/5] Add CI and catalogue generation [mass update] --- .drone.yml | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..769b7eb --- /dev/null +++ b/.drone.yml @@ -0,0 +1,38 @@ +--- +kind: pipeline +name: deploy to swarm-test.autonomic.zone +steps: + - name: deployment + image: decentral1se/stack-ssh-deploy:latest + settings: + host: swarm-test.autonomic.zone + stack: botamusique + generate_secrets: true + purge: true + deploy_key: + from_secret: drone_ssh_swarm_test + networks: + - proxy + environment: + DOMAIN: botamusique.swarm-test.autonomic.zone + STACK_NAME: botamusique + LETS_ENCRYPT_ENV: production +trigger: + branch: + - main +--- +kind: pipeline +name: generate recipe catalogue +steps: + - name: release a new version + image: plugins/downstream + settings: + server: https://build.coopcloud.tech + token: + from_secret: drone_abra-bot_token + fork: true + repositories: + - coop-cloud/auto-recipes-catalogue-json + +trigger: + event: tag From 983d9a84e0120fe7c6b4210e8acf6d48c335788c Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 21:32:06 -0800 Subject: [PATCH 3/5] Add drone configs / secrets [mass update] --- .drone.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.drone.yml b/.drone.yml index 769b7eb..2f06a93 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,9 @@ steps: DOMAIN: botamusique.swarm-test.autonomic.zone STACK_NAME: botamusique LETS_ENCRYPT_ENV: production + ENTRYPOINT_CONF_VERSION: v1 + SECRET_BAM_CERTIFICATE_VERSION: v1 + SECRET_BAM_MUMBLE_PASSWORD: v1 trigger: branch: - main From ab446af4a8bb4fd2fba58af5e89fb3363f6cc328 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 22:08:12 -0800 Subject: [PATCH 4/5] Fix mumble password version name --- .drone.yml | 2 +- .env.sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2f06a93..26af7eb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: LETS_ENCRYPT_ENV: production ENTRYPOINT_CONF_VERSION: v1 SECRET_BAM_CERTIFICATE_VERSION: v1 - SECRET_BAM_MUMBLE_PASSWORD: v1 + SECRET_MUMBLE_PASSWORD_VERSION: v1 trigger: branch: - main diff --git a/.env.sample b/.env.sample index 76e9922..036a181 100644 --- a/.env.sample +++ b/.env.sample @@ -13,4 +13,4 @@ LETS_ENCRYPT_ENV=production #BAM_VERBOSE= SECRET_BAM_CERTIFICATE_VERSION=v1 -SECRET_BAM_MUMBLE_PASSWORD=v1 +SECRET_MUMBLE_PASSWORD_VERSION=v1 From 8facdd110ac9b9570806802ccae36b0f0e6a7997 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sat, 21 Jan 2023 11:49:55 -0800 Subject: [PATCH 5/5] Switch to self-hosted stack-ssh-deploy image [mass update] --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 26af7eb..c4b624c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ kind: pipeline name: deploy to swarm-test.autonomic.zone steps: - name: deployment - image: decentral1se/stack-ssh-deploy:latest + image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest settings: host: swarm-test.autonomic.zone stack: botamusique