chore: publish 2.1.0+2.2.2 release

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>

.drone.yml

@@ -17,7 +17,9 @@ steps:
       DOMAIN: authentik.swarm-test.autonomic.zone
       STACK_NAME: authentik
       LETS_ENCRYPT_ENV: production
-      CONFIG_YML_VERSION: v1
+      CONFIG_YML_VERSION: v9
+      HEALTHCHECK_VERSION: v1
+      PG_BACKUP_VERSION: v2
       SECRET_DB_PASSWORD_VERSION: v1
       SECRET_JWT_SECRET_VERSION: v1
 
@@ -36,8 +38,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - coop-cloud/auto-recipes-catalogue-json
+        - toolshed/auto-recipes-catalogue-json
 
 trigger:
   event: tag
-

.env.sample

@@ -1,11 +1,13 @@
 TYPE=vikunja
 TIMEOUT=300
 ENABLE_AUTO_UPDATE=true
+ENABLE_BACKUPS=true
 
 DOMAIN=vikunja.example.com
 
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.vikunja.example.com`'
+#REDIRECT_DOMAIN=www.vikunja.example.com
 
 LETS_ENCRYPT_ENV=production
 
@@ -40,7 +42,10 @@ VIKUNJA_AUTH_LOCAL_ENABLED=false
 # COMPOSE_FILE="${COMPOSE_FILE}:compose.smtp.yml"
 # VIKUNJA_MAILER_ENABLED=true
 # VIKUNJA_MAILER_HOST=mail.example.com
+# VIKUNJA_MAILER_PORT=25
 # VIKUNJA_MAILER_AUTHTYPE=plain # possible: plain, login, cram-md5
 # VIKUNJA_MAILER_USERNAME=user
 # VIKUNJA_MAILER_FROMEMAIL=user@example.com
-# SECRET_SMTP_PASSWORD_VERSION=v1
+# VIKUNJA_MAILER_SKIPTLSVERIFY=false
+# VIKUNJA_MAILER_FORCESSL=false
+# SECRET_SMTP_PASSWORD_VERSION=v1

README.md

@@ -23,3 +23,28 @@ Organize everything, on all platforms
 * `abra app deploy <app-name>`
 
 For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).
+
+
+## Healthcheck
+
+Vikunja uses a docker [scratch](https://hub.docker.com/_/scratch/) image, that is completely empty, therefore it is necessary to copy a statically build healthcheck binary into the container to perform the healthcheck.
+
+To verify the binary in this recipe run this code:
+
+```
+# Set the source date epoch for reproducibility
+export SOURCE_DATE_EPOCH=1640995200
+export DOCKER_BUILDKIT=1
+
+# Build the Docker image
+docker build --build-arg SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} -t healthcheck -f healthcheck_Dockerfile .
+
+# Create container, extract binary and remove the container
+docker create --name healthcheck_builder healthcheck
+docker cp healthcheck_builder:/app/healthcheck .
+docker rm healthcheck_builder
+
+# Check if the build is reproducible by calculating hash
+sha256sum healthcheck
+```
+The sha256 checksum should be **c7c12a0eb019edd275c3f5a9302c70b2112941a8c0b9d9128d26c66a81a263c6**

abra.sh

@@ -1 +1,3 @@
-export CONFIG_YML_VERSION=v8
+export CONFIG_YML_VERSION=v10
+export HEALTHCHECK_VERSION=v1
+export PG_BACKUP_VERSION=v2

compose.smtp.yml

@@ -3,11 +3,15 @@ version: "3.8"
 services:
   app:
     environment:
-      - SMTP_ENABLED
-      - SMTP_HOST
-      - SMTP_AUTHTYPE
-      - SMTP_USER
-      - SMTP_FROM_EMAIL
+      - VIKUNJA_MAILER_ENABLED
+      - VIKUNJA_MAILER_HOST
+      - VIKUNJA_MAILER_PORT
+      - VIKUNJA_MAILER_AUTHTYPE
+      - VIKUNJA_MAILER_SKIPTLSVERIFY
+      - VIKUNJA_MAILER_FORCESSL
+      - VIKUNJA_MAILER_USERNAME
+      - VIKUNJA_MAILER_PASSWORD_FILE=/run/secrets/smtp_password
+      - VIKUNJA_MAILER_FROMEMAIL
       
     secrets:
       - smtp_password

compose.yml

@@ -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.2
+    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
@@ -21,12 +37,6 @@ services:
       - VIKUNJA_CACHE_TYPE=redis
       - VIKUNJA_SERVICE_ENABLEREGISTRATION=false
       - VIKUNJA_SERVICE_JWTTTL=604800
-      - VIKUNJA_MAILER_ENABLED
-      - VIKUNJA_MAILER_HOST
-      - VIKUNJA_MAILER_AUTHTYPE
-      - VIKUNJA_MAILER_USERNAME
-      - VIKUNJA_MAILER_PASSWORD_FILE=/run/secrets/smtp_password
-      - VIKUNJA_MAILER_FROMEMAIL
       - VIKUNJA_LOG_LEVEL
       - VIKUNJA_LOG_DATABASE
       - VIKUNJA_LOG_DATABASELEVEL
@@ -36,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,29 +57,33 @@ services:
     configs:
       - source: config_yml
         target: /etc/vikunja/config.yml
+      - source: healthcheck
+        target: /healthcheck
+        mode: 555
     deploy:
       labels:
         - "traefik.enable=true"
+        - "traefik.swarm.network=proxy"
         - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3456"
-        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
+        - "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
+        - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectregex.regex=^https://${REDIRECT_DOMAIN:-example.com}(.*)"
+        - "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.0.0+0.24.2"
+        - "coop-cloud.${STACK_NAME}.version=2.1.0+2.2.2"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
-   #healthcheck:
-   #  test: [ "CMD", "curl", "-f", "http://localhost:3456" ]
-   #  interval: 30s
-   #  timeout: 10s
-   #  retries: 10
-   #  start_period: 1m
+    healthcheck:
+      test: ["CMD", "/healthcheck"]
+      interval: 30s
+      timeout: 10s
+      retries: 30
+      start_period: 1m
 
   redis:
-    image: redis
+    image: redis:8.6.1-alpine
     networks:
       - internal
-    ports:
-      - "6379:6379"
-
 
   db:
     image: postgres:13
@@ -81,34 +95,45 @@ 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:
       - db_password
     deploy:
       labels:
-        backupbot.backup: "true"
-        backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
-        backupbot.backup.post-hook: "rm -rf /var/lib/postgresql/data/backup.sql"
-        backupbot.backup.path: "/var/lib/postgresql/data/backup.sql"
+        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"
+    configs:
+      - 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}
     file: config.yml.tmpl
     template_driver: golang
+  healthcheck:
+    name: ${STACK_NAME}_healthcheck_${HEALTHCHECK_VERSION}
+    file: healthcheck
+  pg_backup:
+    name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
+    file: pg_backup.sh
 
 secrets:
   db_password:

config.yml.tmpl

@@ -5,14 +5,17 @@ service:
   JWTSecret: {{ secret "jwt_secret" }}
 database:
   password: "{{ secret "db_password" }}"
+{{ if eq (env "VIKUNJA_MAILER_ENABLED") "true" }}
 mailer:
   password: {{ secret "smtp_password" }}
+{{ end }}
 {{ if eq (env "OAUTH_ENABLED") "true" }}
 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" }}

debug_Dockerfile

@@ -0,0 +1,16 @@
+FROM vikunja/vikunja:0.24.2 AS vikunja-scratch
+
+FROM alpine
+
+RUN apk add --upgrade --no-cache vim bash curl
+
+WORKDIR /app/vikunja
+CMD [ "/app/vikunja/vikunja" ]
+EXPOSE 3456
+USER 1000
+
+ENV VIKUNJA_SERVICE_ROOTPATH=/app/vikunja/
+ENV VIKUNJA_DATABASE_PATH=/db/vikunja.db
+
+COPY --from=vikunja-scratch /app/vikunja /app/vikunja
+COPY --from=vikunja-scratch /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/

healthcheck.c

@@ -0,0 +1,50 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
+int main() {
+    int sockfd;
+    struct sockaddr_in server_addr;
+    char request[] = "HEAD / HTTP/1.1\r\nHost: localhost\r\n\r\n";
+    char response[1024];
+    int received_bytes;
+
+    sockfd = socket(AF_INET, SOCK_STREAM, 0);
+    if (sockfd < 0) {
+        perror("socket");
+        return 1;
+    }
+
+    server_addr.sin_family = AF_INET;
+    server_addr.sin_port = htons(3456);
+    server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+
+    if (connect(sockfd, (struct sockaddr *)&server_addr, sizeof(server_addr)) < 0) {
+        perror("connect");
+        close(sockfd);
+        return 1;
+    }
+
+    send(sockfd, request, strlen(request), 0);
+
+    received_bytes = recv(sockfd, response, sizeof(response) - 1, 0);
+    if (received_bytes < 0) {
+        perror("recv");
+        close(sockfd);
+        return 1;
+    }
+
+    // Null-terminieren der empfangenen Bytes
+    response[received_bytes] = '\0';
+
+    // Statuscode extrahieren (erste Zeile enthält den Statuscode)
+    char *status_line = strtok(response, "\r\n");
+    printf("Response: %s\n", status_line);
+
+    close(sockfd);
+    return 0;
+}

healthcheck_Dockerfile

@@ -0,0 +1,13 @@
+FROM alpine:latest
+
+ENV SOURCE_DATE_EPOCH=1640995200
+
+RUN apk add --no-cache gcc musl-dev
+
+WORKDIR /app
+
+COPY healthcheck.c /app
+
+RUN gcc -o healthcheck healthcheck.c -static
+
+CMD ["./healthcheck"]

pg_backup.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+
+set -e
+
+BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
+
+function backup {
+  export PGPASSWORD=$(cat /run/secrets/db_password)
+  pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
+}
+
+function restore {
+    cd /var/lib/postgresql/data/
+    restore_config(){
+        # Restore allowed connections
+        cat pg_hba.conf.bak > pg_hba.conf
+        su postgres -c 'pg_ctl reload'
+    }
+    # Don't allow any other connections than local
+    cp pg_hba.conf pg_hba.conf.bak
+    echo "local all all trust" > pg_hba.conf
+    su postgres -c 'pg_ctl reload'
+    trap restore_config EXIT INT TERM
+
+    # Recreate Database
+    psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);" 
+    createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
+    psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
+
+    trap - EXIT INT TERM
+    restore_config
+}
+
+$@

release/1.3.0+0.24.6

@@ -0,0 +1 @@
+add missing smtp options and increase healthcheck retries

release/2.1.0+2.2.2

@@ -0,0 +1 @@
+patch CVEs: CVE-2026-33312 and CVE-2026-29794