From 94a32709918feed4ed34538e8eaa9e27ead091a5 Mon Sep 17 00:00:00 2001 From: Philipp Rothmann Date: Wed, 18 Jan 2023 22:03:12 +0100 Subject: [PATCH 1/7] feat: add frame ancestors variable --- .env.sample | 1 + abra.sh | 2 +- compose.yml | 1 + coolwsd.xml.tmpl | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.env.sample b/.env.sample index d33f855..28ae38e 100644 --- a/.env.sample +++ b/.env.sample @@ -4,3 +4,4 @@ LETS_ENCRYPT_ENV=production NEXTCLOUD_DOMAIN=nextcloud.example.com ADMIN_USERNAME=admin SECRET_ADMIN_PASSWORD_VERSION=v1 +FRAME_ANCESTORS= diff --git a/abra.sh b/abra.sh index b44d613..895aa1e 100644 --- a/abra.sh +++ b/abra.sh @@ -1,2 +1,2 @@ export NGINX_CONF_VERSION=v2 -export COOLWSD_XML_VERSION=v1 +export COOLWSD_XML_VERSION=v2 diff --git a/compose.yml b/compose.yml index 03306f1..114955f 100644 --- a/compose.yml +++ b/compose.yml @@ -39,6 +39,7 @@ services: - DOMAIN=${DOMAIN} - DONT_GEN_SSL_CERT=true - NEXTCLOUD_DOMAIN=${NEXTCLOUD_DOMAIN} + - FRAME_ANCESTORS networks: - internal deploy: diff --git a/coolwsd.xml.tmpl b/coolwsd.xml.tmpl index 2e2e3e4..3f5fad0 100644 --- a/coolwsd.xml.tmpl +++ b/coolwsd.xml.tmpl @@ -125,7 +125,7 @@ 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} ::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} - + {{ env "FRAME_ANCESTORS" }} From 7a3aa21ffa10192da98d6b4db274c1e4c7d9c8de 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 4ce600e..44eb663 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ 1. Set up Docker Swarm and [`abra`](https://git.autonomic.zone/coop-cloud/abra) 1. Deploy [`coop-cloud/traefik`](https://git.autonomic.zone/coop-cloud/traefik) -1. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to +1. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to your Docker swarm box -1. `abra app YOURAPPDOMAIN deploy` +1. `abra app deploy YOURAPPDOMAIN` ## Acknowledgements From 6b8318a28d59d9388438202680b2b658cf7dafb6 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 e76fc20..58a49c4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,11 +22,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 collabora 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 da8248dd5f880fea57119247f53a46b9de001302 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 58a49c4..1c9c888 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,8 @@ steps: settings: host: swarm-test.autonomic.zone stack: collabora + networks: + - proxy generate_secrets: true purge: true deploy_key: From dc9f4d771e80b1a3ef7a6efd9e8abc14df83eb50 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 1c9c888..0c88a00 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,8 @@ steps: STACK_NAME: collabora LETS_ENCRYPT_ENV: production NGINX_CONF_VERSION: v1 - LOOLWSD_XML_VERSION: v1 + COOLWSD_XML_VERSION: v1 + SECRET_ADMIN_PASSWORD_VERSION: v1 trigger: branch: - main From 92f92f50fc5ce286b038535222423aa045a8043d Mon Sep 17 00:00:00 2001 From: 3wc <3wc@doesthisthing.work> Date: Sat, 21 Jan 2023 11:49:55 -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 0c88a00..7cc1874 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: collabora From 285efcdf4772409b62e0e935a57e6dd9d6819251 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Mon, 13 Feb 2023 09:53:42 +0100 Subject: [PATCH 7/7] chore: publish 2.2.0+22.05.10.1.1 release --- compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.yml b/compose.yml index 114955f..1529ba1 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: web: - image: "nginx:1.22.1" + image: "nginx:1.23.3" environment: - STACK_NAME - DOMAIN=${DOMAIN} @@ -24,7 +24,7 @@ services: - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" app: - image: "collabora/code:22.05.8.2.1" + image: "collabora/code:22.05.10.1.1" cap_add: - MKNOD secrets: @@ -44,7 +44,7 @@ services: - internal deploy: labels: - - "coop-cloud.${STACK_NAME}.version=2.1.2+22.05.8.2.1" + - "coop-cloud.${STACK_NAME}.version=2.2.0+22.05.10.1.1" networks: proxy: