Compare commits

..
5 Commits
Author SHA1 Message Date
moritz c925f1cedc chore: publish 2.1.0+2.2.2 release
continuous-integration/drone/push Build is failing
continuous-integration/drone/tag Build is passing
2026-03-24 13:30:15 +01:00
moritz 7246a8d475 chore: publish 2.0.0+2.1.0 release
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2026-03-17 00:34:46 +01:00
Apfelwurm 77b79f1e94 chore: publish 1.3.0+0.24.6 release
continuous-integration/drone/tag Build is passing
continuous-integration/drone/push Build is failing
2026-01-06 18:38:35 +01:00
Apfelwurm 3f0d97f064 fix: smtp.yml and add smtp options (#5)
continuous-integration/drone/push Build is failing
Adds all the smtp options, and moves the env variables to the right compose file

Reviewed-on: #5
Reviewed-by: kolaente <coopcloud-git@kolaente.de>
Co-authored-by: Apfelwurm <Alexander@volzit.de>
Co-committed-by: Apfelwurm <Alexander@volzit.de>
2026-01-06 17:33:39 +00:00
moritz 2710454c8e increase healthcheck retries
continuous-integration/drone/push Build is failing
2025-12-23 14:46:34 +01:00
5 changed files with 37 additions and 17 deletions
+1 -1
View File
@@ -1,3 +1,3 @@
export CONFIG_YML_VERSION=v9
export CONFIG_YML_VERSION=v10
export HEALTHCHECK_VERSION=v1
export PG_BACKUP_VERSION=v2
+32 -15
View File
@@ -2,13 +2,29 @@
version: "3.8"
services:
vikunja-init:
image: busybox:1.37.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:
image: vikunja/vikunja:0.24.6
image: vikunja/vikunja:2.2.2
environment:
- DOMAIN
- LOG_LEVEL
- VIKUNJA_RATELIMIT_NOAUTHLIMIT
- VIKUNJA_SERVICE_PUBLICURL=${DOMAIN}
- VIKUNJA_SERVICE_PUBLICURL=https://${DOMAIN}
- VIKUNJA_DATABASE_HOST=db
- VIKUNJA_DATABASE_PASSWORD_FILE=/run/secrets/db_password
- VIKUNJA_DATABASE_TYPE=postgres
@@ -30,7 +46,7 @@ services:
- VIKUNJA_AUTH_LOCAL_ENABLED
- VIKUNJA_DEFAULTSETTINGS_DISCOVERABLE_BY_NAME
- VIKUNJA_DEFAULTSETTINGS_DISCOVERABLE_BY_EMAIL
volumes:
volumes:
- files:/app/vikunja/files
networks:
- proxy
@@ -47,7 +63,7 @@ services:
deploy:
labels:
- "traefik.enable=true"
- "traefik.docker.network=proxy"
- "traefik.swarm.network=proxy"
- "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3456"
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
@@ -55,17 +71,17 @@ services:
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.replacement=https://${DOMAIN}$${1}"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "coop-cloud.${STACK_NAME}.version=1.2.0+0.24.6"
- "coop-cloud.${STACK_NAME}.version=2.1.0+2.2.2"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
healthcheck:
test: [ "CMD", "/healthcheck"]
test: ["CMD", "/healthcheck"]
interval: 30s
timeout: 10s
retries: 10
retries: 30
start_period: 1m
redis:
image: redis:8.2.2-alpine
image: redis:8.6.1-alpine
networks:
- internal
@@ -79,7 +95,10 @@ services:
- db:/var/lib/postgresql/data
healthcheck:
test: ["CMD-SHELL", "pg_isready -h localhost -U $$POSTGRES_USER"]
interval: 2s
interval: 10s
timeout: 10s
retries: 30
start_period: 1m
networks:
- internal
secrets:
@@ -89,23 +108,21 @@ services:
backupbot.backup: "${ENABLE_BACKUPS:-true}"
backupbot.backup.pre-hook: "/pg_backup.sh backup"
backupbot.backup.volumes.db.path: "backup.sql"
backupbot.restore.post-hook: '/pg_backup.sh restore'
backupbot.restore.post-hook: "/pg_backup.sh restore"
configs:
- source: pg_backup
target: /pg_backup.sh
mode: 0555
- source: pg_backup
target: /pg_backup.sh
mode: 0555
volumes:
files:
db:
networks:
proxy:
external: true
internal:
configs:
config_yml:
name: ${STACK_NAME}_config_yml_${CONFIG_YML_VERSION}
+2 -1
View File
@@ -14,7 +14,8 @@ auth:
openid:
enabled: {{ env "OAUTH_ENABLED" }}
providers:
- name: {{ env "OAUTH_NAME" }}
{{ env "OAUTH_NAME" }}:
name: {{ env "OAUTH_NAME" }}
authurl: {{ env "OAUTH_URL" }}
logouturl: {{ env "OAUTH_LOGOUT_URL" }}
clientid: {{ env "OAUTH_CLIENT_ID" }}
+1
View File
@@ -0,0 +1 @@
add missing smtp options and increase healthcheck retries
+1
View File
@@ -0,0 +1 @@
patch CVEs: CVE-2026-33312 and CVE-2026-29794