generated from coop-cloud/example
Compare commits
16 Commits
2.1.2+22.0
...
main
Author | SHA1 | Date |
---|---|---|
3wc | bced1c5993 | |
p4u1 | 86b36e6208 | |
3wc | cedf401c57 | |
knoflook | 835bd6613b | |
Moritz | d52e12925a | |
javielico | e6607f4801 | |
javielico | 73d3cbd42f | |
javielico | ad59bedf8d | |
javielico | da1835a3a6 | |
decentral1se | 285efcdf47 | |
3wc | 92f92f50fc | |
3wc | dc9f4d771e | |
3wc | da8248dd5f | |
3wc | 6b8318a28d | |
3wc | 7a3aa21ffa | |
Philipp Rothmann | 94a3270991 |
23
.drone.yml
23
.drone.yml
|
@ -3,10 +3,12 @@ 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
|
||||
networks:
|
||||
- proxy
|
||||
generate_secrets: true
|
||||
purge: true
|
||||
deploy_key:
|
||||
|
@ -16,17 +18,24 @@ 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
|
||||
---
|
||||
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
|
||||
|
|
|
@ -4,3 +4,4 @@ LETS_ENCRYPT_ENV=production
|
|||
NEXTCLOUD_DOMAIN=nextcloud.example.com
|
||||
ADMIN_USERNAME=admin
|
||||
SECRET_ADMIN_PASSWORD_VERSION=v1
|
||||
FRAME_ANCESTORS=
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
2
abra.sh
2
abra.sh
|
@ -1,2 +1,2 @@
|
|||
export NGINX_CONF_VERSION=v2
|
||||
export COOLWSD_XML_VERSION=v1
|
||||
export COOLWSD_XML_VERSION=v2
|
||||
|
|
|
@ -3,7 +3,7 @@ version: "3.8"
|
|||
|
||||
services:
|
||||
web:
|
||||
image: "nginx:1.22.1"
|
||||
image: "nginx:1.25.4"
|
||||
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:23.05.10.1.1"
|
||||
cap_add:
|
||||
- MKNOD
|
||||
secrets:
|
||||
|
@ -39,11 +39,12 @@ services:
|
|||
- DOMAIN=${DOMAIN}
|
||||
- DONT_GEN_SSL_CERT=true
|
||||
- NEXTCLOUD_DOMAIN=${NEXTCLOUD_DOMAIN}
|
||||
- FRAME_ANCESTORS
|
||||
networks:
|
||||
- internal
|
||||
deploy:
|
||||
labels:
|
||||
- "coop-cloud.${STACK_NAME}.version=2.1.2+22.05.8.2.1"
|
||||
- "coop-cloud.${STACK_NAME}.version=2.7.1+23.05.10.1.1"
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
|
|
|
@ -125,7 +125,7 @@
|
|||
<host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
|
||||
<host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
|
||||
</post_allow>
|
||||
<frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
|
||||
<frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space.">{{ env "FRAME_ANCESTORS" }}</frame_ancestors>
|
||||
<connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
|
||||
|
||||
<!-- this setting radically changes how online works, it should not be used in a production environment -->
|
||||
|
|
Loading…
Reference in New Issue