From d73939218e0df2fcc4fc25d80bf25e76900e200a Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Fri, 2 Dec 2022 14:57:42 +0100 Subject: [PATCH 1/7] chore: publish 0.2.0+apache-debian-1.29.1-prod release --- compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose.yml b/compose.yml index 6d0d923..f8bc683 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: '3.8' services: app: - image: kimai/kimai2:apache-1.26.0-prod + image: kimai/kimai2:apache-1.29.1-prod environment: - APP_ENV=prod - TRUSTED_HOSTS=localhost,traefik,${DOMAIN},127.0.0.1 @@ -57,7 +57,7 @@ services: - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - - coop-cloud.${STACK_NAME}.app.version=0.1.0+apache-debian-1.26.0-prod + - coop-cloud.${STACK_NAME}.app.version=0.2.0+apache-debian-1.29.1-prod db: image: mysql:5.7 environment: From 7f8382687a142279ae8ece210420cd587866267f Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Thu, 19 Jan 2023 16:02:27 -0800 Subject: [PATCH 2/7] 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 8e08cbf..b53ab85 100644 --- a/README.md +++ b/README.md @@ -20,9 +20,9 @@ Based on the recommended [`tobybatch/kimai2`] compose file. 1. Set up Docker Swarm and [`abra`] 2. Deploy [`coop-cloud/traefik`] 3. `abra app new kimai --secrets` -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. `abra app run YOURAPPDOMAIN app create_admin` [Kimai]: https://www.kimai.org/ From e88b9bdc76f3c7ed7f9cd9cf7f2a42bc81047ef8 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 10:27:11 -0800 Subject: [PATCH 3/7] Automatically generate catalogue on release [mass update] Re: coop-cloud/recipes-catalogue-json#4 --- .drone.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 51618f2..653305c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -24,11 +24,17 @@ trigger: - main --- kind: pipeline -name: recipe release +name: generate recipe catalogue steps: - name: release a new version - image: thecoopcloud/drone-abra:latest + image: plugins/downstream settings: - command: recipe kimai release - deploy_key: - from_secret: abra_bot_deploy_key + 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 f42ad06dbf13fad530c4506f84329f42e9b3f65f Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 11:58:41 -0800 Subject: [PATCH 4/7] Fix CI by adding networks: [mass update] --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 653305c..e62c757 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,8 @@ steps: settings: host: swarm-test.autonomic.zone stack: kimai + networks: + - proxy deploy_key: from_secret: drone_ssh_swarm_test generate_secrets: true From ca97a2b24857dae2173ba0fde42d20b33235b4be Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Fri, 20 Jan 2023 21:32:06 -0800 Subject: [PATCH 5/7] Add drone configs / secrets [mass update] --- .drone.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index e62c757..8449bfb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,9 +18,10 @@ steps: STACK_NAME: kimai LETS_ENCRYPT_ENV: production ENTRYPOINT_CONF_VERSION: v1 - ADMIN_PASSWORD_VERSION: v1 - DB_PASSWORD_VERSION: v1 - DB_ROOT_PASSWORD_VERSION: v1 + LOCAL_CONF_VERSION: v1 + SECRET_DB_PASSWORD_VERSION: v1 + SECRET_DB_ROOT_PASSWORD_VERSION: v1 + SECRET_ADMIN_PASSWORD_VERSION: v1 trigger: branch: - main From af070f42e7ed0516cc978f70e2eb1455a31e9946 Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sat, 21 Jan 2023 11:49:56 -0800 Subject: [PATCH 6/7] 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 8449bfb..2d9700a 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: kimai From 7220e081098f874f30a3a4fb230bd0c8c3a657fa Mon Sep 17 00:00:00 2001 From: Moritz Date: Tue, 28 Feb 2023 15:27:11 +0100 Subject: [PATCH 7/7] fix version label --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index f8bc683..0b9950c 100644 --- a/compose.yml +++ b/compose.yml @@ -57,7 +57,7 @@ services: - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" - "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - - coop-cloud.${STACK_NAME}.app.version=0.2.0+apache-debian-1.29.1-prod + - "coop-cloud.${STACK_NAME}.version=0.2.0+apache-debian-1.29.1-prod" db: image: mysql:5.7 environment: