Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
828c7c1300 | ||
|
|
f0c6a3c19c | ||
|
|
94f238c4af | ||
|
|
1dfdd90845 | ||
|
|
660a5fee21 | ||
|
|
8d23542076 | ||
|
|
29968706fc | ||
|
|
1db30e2cda | ||
|
|
ec1735a005 | ||
|
|
29a7d585dc | ||
|
|
d0191f1c49 | ||
|
|
58bfa65b8a | ||
|
|
98c0268b72 | ||
|
|
73c8b662d4 | ||
|
|
674cbd0431 |
@@ -18,6 +18,7 @@ steps:
|
|||||||
STACK_NAME: hedgedoc
|
STACK_NAME: hedgedoc
|
||||||
LETS_ENCRYPT_ENV: production
|
LETS_ENCRYPT_ENV: production
|
||||||
SECRET_DB_PASSWORD_VERSION: v1
|
SECRET_DB_PASSWORD_VERSION: v1
|
||||||
|
SECRET_SESSION_SECRET_VERSION: v1
|
||||||
ENTRYPOINT_CONF_VERSION: v1
|
ENTRYPOINT_CONF_VERSION: v1
|
||||||
PG_BACKUP_VERSION: v1
|
PG_BACKUP_VERSION: v1
|
||||||
trigger:
|
trigger:
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
export ENTRYPOINT_CONF_VERSION=v10
|
export ENTRYPOINT_CONF_VERSION=v13
|
||||||
export PG_BACKUP_VERSION=v1
|
export PG_BACKUP_VERSION=v1
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ version: "3.8"
|
|||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- CMD_DB_URL=
|
- CMD_DB_TYPE=postgres
|
||||||
- CMD_DB_NAME=codimd
|
- CMD_DB_NAME=codimd
|
||||||
- CMD_DB_USER=codimd
|
- CMD_DB_USER=codimd
|
||||||
- CMD_DB_HOST=db
|
- CMD_DB_HOST=db
|
||||||
@@ -14,7 +14,7 @@ services:
|
|||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
db:
|
db:
|
||||||
image: postgres:16.4-alpine
|
image: pgautoupgrade/pgautoupgrade:16-alpine
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=codimd
|
- POSTGRES_USER=codimd
|
||||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: quay.io/hedgedoc/hedgedoc:1.10.1
|
image: quay.io/hedgedoc/hedgedoc:1.10.3
|
||||||
environment:
|
environment:
|
||||||
- CMD_USECDN=false
|
- CMD_USECDN=false
|
||||||
- CMD_URL_ADDPORT=false
|
- CMD_URL_ADDPORT=false
|
||||||
@@ -54,7 +54,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=2.0.0+1.10.1"
|
- "coop-cloud.${STACK_NAME}.version=3.0.2+1.10.3"
|
||||||
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
|
||||||
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); } });\""
|
||||||
|
|||||||
+5
-1
@@ -22,7 +22,9 @@ file_env() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
load_vars() {
|
load_vars() {
|
||||||
|
if [ -n "${CMD_DB_PASSWORD_FILE:-""}" ] ; then
|
||||||
file_env "CMD_DB_PASSWORD"
|
file_env "CMD_DB_PASSWORD"
|
||||||
|
fi
|
||||||
file_env "CMD_OAUTH2_CLIENT_SECRET"
|
file_env "CMD_OAUTH2_CLIENT_SECRET"
|
||||||
file_env "CMD_SESSION_SECRET"
|
file_env "CMD_SESSION_SECRET"
|
||||||
}
|
}
|
||||||
@@ -40,7 +42,9 @@ main() {
|
|||||||
|
|
||||||
main
|
main
|
||||||
|
|
||||||
export CMD_DB_URL="${CMD_DB_URL:-postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CMD_DB_NAME}"
|
if [ -n "${CMD_DB_PASSWORD:-""}" ] ; then
|
||||||
|
export CMD_DB_URL="${CMD_DB_TYPE}://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST:5432/$CMD_DB_NAME"
|
||||||
|
fi
|
||||||
|
|
||||||
# 3wc: `source /docker-entrypoint.sh -e` to load CMD_DB_URL for CLI scripts
|
# 3wc: `source /docker-entrypoint.sh -e` to load CMD_DB_URL for CLI scripts
|
||||||
if [ ! "${1-}" == "-e" ]; then
|
if [ ! "${1-}" == "-e" ]; then
|
||||||
|
|||||||
@@ -1 +1,5 @@
|
|||||||
Upgrade to fix GHSA-6w39-x2c6-6mpf
|
Upgrade to fix GHSA-6w39-x2c6-6mpf
|
||||||
|
|
||||||
|
BREAKING CHANGE!! new secret "session_secret" added, run:
|
||||||
|
|
||||||
|
abra app secret generate <app_domain> session_secret v1
|
||||||
|
|||||||
@@ -0,0 +1 @@
|
|||||||
|
This release switches to `pgaautoupgrade` for easier Postgresql upgrades. If you are using Postgres, please take extra care to take a backup before upgrading.
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
Security upgrade for GHSA-3983-rrqh-mvx5
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
CRITICAL FIX: since version 3 this recipe uses always sqlite as database. This patch fixes instances running postgres
|
||||||
Reference in New Issue
Block a user