forked from coop-cloud/vikunja
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8257abec54 |
@@ -1,3 +1,3 @@
|
|||||||
export CONFIG_YML_VERSION=v10
|
export CONFIG_YML_VERSION=v9
|
||||||
export HEALTHCHECK_VERSION=v1
|
export HEALTHCHECK_VERSION=v1
|
||||||
export PG_BACKUP_VERSION=v2
|
export PG_BACKUP_VERSION=v2
|
||||||
|
|||||||
+16
-33
@@ -2,29 +2,13 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
vikunja-init:
|
|
||||||
image: busybox:1.38.0
|
|
||||||
command:
|
|
||||||
[
|
|
||||||
"sh",
|
|
||||||
"-c",
|
|
||||||
"chown -R 1000:0 /app/vikunja/files && chmod -R 775 /app/vikunja/files && sleep 300",
|
|
||||||
]
|
|
||||||
volumes:
|
|
||||||
- files:/app/vikunja/files
|
|
||||||
deploy:
|
|
||||||
replicas: 1
|
|
||||||
restart_policy:
|
|
||||||
condition: none
|
|
||||||
max_attempts: 0
|
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: vikunja/vikunja:2.3.0
|
image: vikunja/vikunja:0.24.6
|
||||||
environment:
|
environment:
|
||||||
- DOMAIN
|
- DOMAIN
|
||||||
- LOG_LEVEL
|
- LOG_LEVEL
|
||||||
- VIKUNJA_RATELIMIT_NOAUTHLIMIT
|
- VIKUNJA_RATELIMIT_NOAUTHLIMIT
|
||||||
- VIKUNJA_SERVICE_PUBLICURL=https://${DOMAIN}
|
- VIKUNJA_SERVICE_PUBLICURL=${DOMAIN}
|
||||||
- VIKUNJA_DATABASE_HOST=db
|
- VIKUNJA_DATABASE_HOST=db
|
||||||
- VIKUNJA_DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
- VIKUNJA_DATABASE_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- VIKUNJA_DATABASE_TYPE=postgres
|
- VIKUNJA_DATABASE_TYPE=postgres
|
||||||
@@ -46,7 +30,7 @@ services:
|
|||||||
- VIKUNJA_AUTH_LOCAL_ENABLED
|
- VIKUNJA_AUTH_LOCAL_ENABLED
|
||||||
- VIKUNJA_DEFAULTSETTINGS_DISCOVERABLE_BY_NAME
|
- VIKUNJA_DEFAULTSETTINGS_DISCOVERABLE_BY_NAME
|
||||||
- VIKUNJA_DEFAULTSETTINGS_DISCOVERABLE_BY_EMAIL
|
- VIKUNJA_DEFAULTSETTINGS_DISCOVERABLE_BY_EMAIL
|
||||||
volumes:
|
volumes:
|
||||||
- files:/app/vikunja/files
|
- files:/app/vikunja/files
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
@@ -63,7 +47,7 @@ services:
|
|||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
- "traefik.enable=true"
|
- "traefik.enable=true"
|
||||||
- "traefik.swarm.network=proxy"
|
- "traefik.docker.network=proxy"
|
||||||
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3456"
|
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3456"
|
||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
@@ -71,22 +55,22 @@ services:
|
|||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}$${1}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}$${1}"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=2.2.0+2.3.0"
|
- "coop-cloud.${STACK_NAME}.version=1.2.0+0.24.6"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "/healthcheck"]
|
test: [ "CMD", "/healthcheck"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 30
|
retries: 10
|
||||||
start_period: 1m
|
start_period: 1m
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:8.8.0-alpine
|
image: redis:8.2.2-alpine
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: pgautoupgrade/pgautoupgrade:17-alpine
|
image: postgres:13
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_PASSWORD_FILE: /run/secrets/db_password
|
POSTGRES_PASSWORD_FILE: /run/secrets/db_password
|
||||||
POSTGRES_USER: vikunja
|
POSTGRES_USER: vikunja
|
||||||
@@ -95,10 +79,7 @@ services:
|
|||||||
- db:/var/lib/postgresql/data
|
- db:/var/lib/postgresql/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -h localhost -U $$POSTGRES_USER"]
|
test: ["CMD-SHELL", "pg_isready -h localhost -U $$POSTGRES_USER"]
|
||||||
interval: 10s
|
interval: 2s
|
||||||
timeout: 10s
|
|
||||||
retries: 30
|
|
||||||
start_period: 1m
|
|
||||||
networks:
|
networks:
|
||||||
- internal
|
- internal
|
||||||
secrets:
|
secrets:
|
||||||
@@ -108,21 +89,23 @@ services:
|
|||||||
backupbot.backup: "${ENABLE_BACKUPS:-true}"
|
backupbot.backup: "${ENABLE_BACKUPS:-true}"
|
||||||
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
||||||
backupbot.backup.volumes.db.path: "backup.sql"
|
backupbot.backup.volumes.db.path: "backup.sql"
|
||||||
backupbot.restore.post-hook: "/pg_backup.sh restore"
|
backupbot.restore.post-hook: '/pg_backup.sh restore'
|
||||||
configs:
|
configs:
|
||||||
- source: pg_backup
|
- source: pg_backup
|
||||||
target: /pg_backup.sh
|
target: /pg_backup.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
files:
|
files:
|
||||||
db:
|
db:
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
internal:
|
internal:
|
||||||
|
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
config_yml:
|
config_yml:
|
||||||
name: ${STACK_NAME}_config_yml_${CONFIG_YML_VERSION}
|
name: ${STACK_NAME}_config_yml_${CONFIG_YML_VERSION}
|
||||||
|
|||||||
+1
-2
@@ -14,8 +14,7 @@ auth:
|
|||||||
openid:
|
openid:
|
||||||
enabled: {{ env "OAUTH_ENABLED" }}
|
enabled: {{ env "OAUTH_ENABLED" }}
|
||||||
providers:
|
providers:
|
||||||
{{ env "OAUTH_NAME" }}:
|
- name: {{ env "OAUTH_NAME" }}
|
||||||
name: {{ env "OAUTH_NAME" }}
|
|
||||||
authurl: {{ env "OAUTH_URL" }}
|
authurl: {{ env "OAUTH_URL" }}
|
||||||
logouturl: {{ env "OAUTH_LOGOUT_URL" }}
|
logouturl: {{ env "OAUTH_LOGOUT_URL" }}
|
||||||
clientid: {{ env "OAUTH_CLIENT_ID" }}
|
clientid: {{ env "OAUTH_CLIENT_ID" }}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
add missing smtp options and increase healthcheck retries
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
patch CVEs: CVE-2026-33312 and CVE-2026-29794
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"extends": [
|
|
||||||
"config:recommended"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user