Compare commits

..

14 Commits

Author SHA1 Message Date
nicksellen a781e47fe2 Set new config options to default values 2021-07-30 19:43:00 +01:00
nicksellen f81b91db99 Add selected environment options 2021-07-30 19:11:32 +01:00
d1admin 28dacc03f7 Revert internal network change (see https://git.autonomic.zone/coop-cloud/organising/issues/62) 2021-07-15 16:08:06 +02:00
Abra Bot 7f1035cc0a Version 2.4.1; sync labels 2021-07-10 13:33:44 +00:00
d1admin 3b2dda0659 Scope internal network internally 2021-07-10 15:33:23 +02:00
d1admin 3325af8171 Version 2.4.1; sync labels 2021-06-21 10:27:42 +00:00
d1admin 8f321b32de Use new image namespace 2021-06-21 12:27:22 +02:00
decentral1se 403c0050f5 Remove trigger, we make the tags [ci skip] 2021-06-04 00:14:11 +02:00
decentral1se 642d75efae Fix bad name in batch update script [ci skip] 2021-06-03 23:06:13 +02:00
decentral1se 1335718e58 Add release logic to CI [ci skip] 2021-06-03 23:00:23 +02:00
decentral1se b145d71b00 Merge pull request 'Update hackmdio/hackmd Docker tag to v2.4.1 (main)' (#5) from renovate/main-docker-hackmdio-hackmd-2.x into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/codimd/pulls/5
2021-05-17 09:44:45 +02:00
decentral1se 3f09a11d69 Merge pull request 'Update postgres Docker tag to v11.12 (main)' (#6) from renovate/main-docker-postgres-11.x into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/codimd/pulls/6
2021-05-17 09:44:32 +02:00
renovate-bot 975ae47c65 Update postgres Docker tag to v11.12 2021-05-17 07:01:16 +00:00
renovate-bot 9e79b182f6 Update hackmdio/hackmd Docker tag to v2.4.1 2021-05-12 07:01:09 +00:00
3 changed files with 45 additions and 5 deletions
+10
View File
@@ -20,3 +20,13 @@ steps:
trigger:
branch:
- main
---
kind: pipeline
name: recipe release
steps:
- name: release a new version
image: thecoopcloud/drone-abra:latest
settings:
command: recipe codimd release
deploy_key:
from_secret: abra_bot_deploy_key
+17
View File
@@ -18,3 +18,20 @@ SECRET_DB_PASSWORD_VERSION=v1
#CMD_OAUTH2_USER_PROFILE_URL="https://keycloak.example.com/auth/realms/realmname/protocol/openid-connect/userinfo"
#
#SECRET_OAUTH_KEY_VERSION=v1
# Options, see https://docs.hedgedoc.org/configuration/
# CMD_ALLOW_ANONYMOUS=true
# CMD_ALLOW_ANONYMOUS_EDITS=false
# CMD_ALLOW_EMAIL_REGISTER=true
# CMD_ALLOW_FREEURL=false
# CMD_ALLOW_GRAVATAR=true
# CMD_ALLOW_ORIGIN=localhost
# CMD_COOKIE_POLICY=lax
# CMD_CSP_ADD_DISQUS=false
# CMD_CSP_ADD_GOOGLE_ANALYTICS=false
# CMD_CSP_ENABLE=true
# CMD_CSP_REPORTURI=undefined
# CMD_DEFAULT_PERMISSION=editable
# CMD_EMAIL=true
# CMD_SESSION_LIFE=1209600000
+18 -5
View File
@@ -1,14 +1,27 @@
version: "3.8"
services:
app:
image: hackmdio/hackmd:2.3.2
image: hackmdio/hackmd:2.4.1
environment:
- CMD_USECDN=false
- CMD_DB_NAME=codimd
- CMD_DB_USER=codimd
- CMD_DB_HOST=db
- CMD_DB_PASSWORD_FILE=/run/secrets/db_password
- CMD_EMAIL # Email login enabled?
- CMD_ALLOW_ANONYMOUS
- CMD_ALLOW_ANONYMOUS_EDITS
- CMD_ALLOW_EMAIL_REGISTER
- CMD_ALLOW_FREEURL
- CMD_ALLOW_GRAVATAR
- CMD_ALLOW_ORIGIN
- CMD_COOKIE_POLICY
- CMD_CSP_ADD_DISQUS
- CMD_CSP_ADD_GOOGLE_ANALYTICS
- CMD_CSP_ENABLE
- CMD_CSP_REPORTURI
- CMD_DEFAULT_PERMISSION
- CMD_EMAIL
- CMD_SESSION_LIFE
depends_on:
- db
networks:
@@ -36,7 +49,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=2.3.2-40b5df94
- coop-cloud.${STACK_NAME}.app.version=2.4.1-e93929f3
healthcheck:
test: ["CMD", "wget", "-qO", "-", "http://localhost:3000"]
interval: 30s
@@ -44,7 +57,7 @@ services:
retries: 10
start_period: 1m
db:
image: postgres:11.11-alpine
image: postgres:11.12-alpine
environment:
- POSTGRES_USER=codimd
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
@@ -56,7 +69,7 @@ services:
networks:
- internal
deploy:
labels: ['coop-cloud.${STACK_NAME}.db.version=11.11-alpine-5c163653']
labels: ['coop-cloud.${STACK_NAME}.db.version=11.12-alpine-09c7c402']
volumes:
postgres:
codimd_uploads: