Compare commits
7 Commits
1.2.1+1.10
...
1.2.2+1.10
Author | SHA1 | Date | |
---|---|---|---|
3efbfec419 | |||
93e5604fcb | |||
917766023b | |||
6feab6a99e | |||
ca5a95bea6 | |||
6a036c4c82 | |||
d19f286c11 |
@ -35,7 +35,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
- toolshed/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
@ -9,6 +9,7 @@ DOMAIN=hedgedoc.example.com
|
|||||||
LETS_ENCRYPT_ENV=production
|
LETS_ENCRYPT_ENV=production
|
||||||
|
|
||||||
SECRET_DB_PASSWORD_VERSION=v1
|
SECRET_DB_PASSWORD_VERSION=v1
|
||||||
|
SECRET_SESSION_SECRET_VERSION=v1
|
||||||
|
|
||||||
COMPOSE_FILE="compose.yml"
|
COMPOSE_FILE="compose.yml"
|
||||||
|
|
||||||
@ -34,6 +35,7 @@ COMPOSE_FILE="compose.yml"
|
|||||||
# CMD_ALLOW_ANONYMOUS_EDITS=false
|
# CMD_ALLOW_ANONYMOUS_EDITS=false
|
||||||
# CMD_ALLOW_EMAIL_REGISTER=true
|
# CMD_ALLOW_EMAIL_REGISTER=true
|
||||||
# CMD_ALLOW_FREEURL=false
|
# CMD_ALLOW_FREEURL=false
|
||||||
|
# CMD_REQUIRE_FREEURL_AUTHENTICATION=true
|
||||||
# CMD_ALLOW_GRAVATAR=true
|
# CMD_ALLOW_GRAVATAR=true
|
||||||
# CMD_ALLOW_ORIGIN=localhost
|
# CMD_ALLOW_ORIGIN=localhost
|
||||||
# CMD_COOKIE_POLICY=lax
|
# CMD_COOKIE_POLICY=lax
|
||||||
|
10
compose.yml
10
compose.yml
@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: quay.io/hedgedoc/hedgedoc:1.10.0
|
image: quay.io/hedgedoc/hedgedoc:1.10.1
|
||||||
environment:
|
environment:
|
||||||
- CMD_USECDN=false
|
- CMD_USECDN=false
|
||||||
- CMD_URL_ADDPORT=false
|
- CMD_URL_ADDPORT=false
|
||||||
@ -16,6 +16,7 @@ services:
|
|||||||
- CMD_ALLOW_ANONYMOUS_EDITS
|
- CMD_ALLOW_ANONYMOUS_EDITS
|
||||||
- CMD_ALLOW_EMAIL_REGISTER
|
- CMD_ALLOW_EMAIL_REGISTER
|
||||||
- CMD_ALLOW_FREEURL
|
- CMD_ALLOW_FREEURL
|
||||||
|
- CMD_REQUIRE_FREEURL_AUTHENTICATION
|
||||||
- CMD_ALLOW_GRAVATAR
|
- CMD_ALLOW_GRAVATAR
|
||||||
- CMD_ALLOW_ORIGIN
|
- CMD_ALLOW_ORIGIN
|
||||||
- CMD_COOKIE_POLICY
|
- CMD_COOKIE_POLICY
|
||||||
@ -26,6 +27,7 @@ services:
|
|||||||
- CMD_DEFAULT_PERMISSION
|
- CMD_DEFAULT_PERMISSION
|
||||||
- CMD_EMAIL
|
- CMD_EMAIL
|
||||||
- CMD_SESSION_LIFE
|
- CMD_SESSION_LIFE
|
||||||
|
- CMD_SESSION_SECRET_FILE=/run/secrets/session_secret
|
||||||
- DOCUMENT_MAX_LENGTH
|
- DOCUMENT_MAX_LENGTH
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
@ -36,6 +38,7 @@ services:
|
|||||||
- codimd_uploads:/hedgedoc/public/uploads
|
- codimd_uploads:/hedgedoc/public/uploads
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
|
- session_secret
|
||||||
entrypoint: /docker-entrypoint.sh
|
entrypoint: /docker-entrypoint.sh
|
||||||
configs:
|
configs:
|
||||||
- source: entrypoint_conf
|
- source: entrypoint_conf
|
||||||
@ -57,7 +60,7 @@ services:
|
|||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=1.2.1+1.10.0"
|
- "coop-cloud.${STACK_NAME}.version=1.2.2+1.10.1"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: "nodejs -e \"http.get('http://localhost:3000', (res) => { console.log('status: ', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });\""
|
test: "nodejs -e \"http.get('http://localhost:3000', (res) => { console.log('status: ', res.statusCode); if (res.statusCode == 200) { process.exit(0); } else { process.exit(1); } });\""
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@ -100,6 +103,9 @@ secrets:
|
|||||||
db_password:
|
db_password:
|
||||||
external: true
|
external: true
|
||||||
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||||
|
session_secret:
|
||||||
|
external: true
|
||||||
|
name: ${STACK_NAME}_session_secret_${SECRET_SESSION_SECRET_VERSION}
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
|
@ -24,6 +24,7 @@ file_env() {
|
|||||||
load_vars() {
|
load_vars() {
|
||||||
file_env "CMD_DB_PASSWORD"
|
file_env "CMD_DB_PASSWORD"
|
||||||
file_env "CMD_OAUTH2_CLIENT_SECRET"
|
file_env "CMD_OAUTH2_CLIENT_SECRET"
|
||||||
|
file_env "CMD_SESSION_SECRET"
|
||||||
}
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
|
1
release/1.2.2+1.10.1
Normal file
1
release/1.2.2+1.10.1
Normal file
@ -0,0 +1 @@
|
|||||||
|
Upgrade to fix GHSA-6w39-x2c6-6mpf
|
Reference in New Issue
Block a user