chore: update dashy

dashy/docker-compose.yml

@@ -14,7 +14,10 @@ services:
       - TZ=America/New_York
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "node", "/app/services/healthcheck"]
+      test:
+        - "CMD"
+        - "node"
+        - "/app/services/healthcheck"
       interval: 1m30s
       timeout: 10s
       retries: 3

gitea-runner/docker-compose.yml

@@ -0,0 +1,13 @@
+services:
+  runner:
+    image: docker.io/gitea/act_runner:0.6.1
+    container_name: gitea-runner
+    restart: unless-stopped
+    environment:
+      CONFIG_FILE: /data/config.yaml
+      GITEA_INSTANCE_URL: https://git.danesi.dev
+      GITEA_RUNNER_REGISTRATION_TOKEN: ${GITEA_RUNNER_REGISTRATION_TOKEN}
+      GITEA_RUNNER_NAME: charon-runner-1
+    volumes:
+      - /srv/gitea-runner/data:/data
+      - /var/run/docker.sock:/var/run/docker.sock

invoiceninja/docker-compose.yml

@@ -4,23 +4,18 @@ services:
     image: nginx
     container_name: in_nginx
     restart: always
+    command: /bin/sh -c "rm -f /etc/nginx/conf.d/default.conf && nginx -g 'daemon off;'"
     env_file: .env
     volumes:
-      # Vhost configuration
+      - /srv/invoiceninja/config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro
-      #- ./config/caddy/Caddyfile:/etc/caddy/Caddyfiledocker-com
+      - /srv/invoiceninja/docker/app/public:/var/www/app/public:ro
-      - ./config/nginx/in-vhost.conf:/etc/nginx/conf.d/in-vhost.conf:ro
-      - ./data/public:/var/www/app/public:ro
     depends_on:
       - app
-    # Run webserver nginx on port 80
+    expose:
-    # Feel free to modify depending what port is already occupied
+      - "80"
-    ports:
-      - "80:80"
-      #- "443:443"
     networks:
       - invoiceninja
-    extra_hosts:
+      - proxy
-      - "in5.localhost:127.0.0.1" #host and ip
 
   app:
     image: invoiceninja/invoiceninja:5
@@ -28,38 +23,27 @@ services:
     env_file: .env
     restart: always
     volumes:
-      - ./config/hosts:/etc/hosts:ro
+      - /srv/invoiceninja/config/hosts:/etc/hosts:ro
-      - ./data/public:/var/www/app/public:rw,delegated
+      - /srv/invoiceninja/docker/app/public:/var/www/app/public:rw,delegated
-      - ./data/storage:/var/www/app/storage:rw,delegated
+      - /srv/invoiceninja/docker/app/storage:/var/www/app/storage:rw,delegated
-      - ./config/php/php.ini:/usr/local/etc/php/php.ini
+      - /srv/invoiceninja/config/php/php.ini:/usr/local/etc/php/php.ini
-      - ./config/php/php-cli.ini:/usr/local/etc/php/php-cli.ini
+      - /srv/invoiceninja/config/php/php-cli.ini:/usr/local/etc/php/php-cli.ini
-
     depends_on:
       - db
     networks:
       - invoiceninja
-    extra_hosts:
-      - "in5.localhost:127.0.0.1" #host and ip
 
   db:
-    image: mariadb:10.4
+    image: mysql:8.4.0-oraclelinux8
     container_name: in_mysql
-    ports:
-      - "3305:3306"
     restart: always
     env_file: .env
     volumes:
-      - ./mysql/data:/var/lib/mysql:rw,delegated
+      - /srv/invoiceninja/docker/mysql/data:/var/lib/mysql:rw,delegated
-
-      # remove comments for next 4 lines if you want auto sql backups
-      #- ./mysql/bak:/backups:rw
-      #- ./config/mysql/backup-script:/etc/cron.daily/daily:ro
-      #- ./config/mysql/backup-script:/etc/cron.weekly/weekly:ro
-      #- ./config/mysql/backup-script:/etc/cron.monthly/monthly:ro
     networks:
       - invoiceninja
-    extra_hosts:
-      - "in5.localhost:127.0.0.1" #host and ip
 
 networks:
   invoiceninja:
+  proxy:
+    external: true

listmonk/docker-compose.yml

@@ -0,0 +1,70 @@
+# All LISTMONK_* env variables also support the LISTMONK_*_FILE pattern for loading secrets from files with Docker secrets and Podman
+# eg: LISTMONK_ADMIN_USER -> LISTMONK_ADMIN_USER_FILE=/path/to/file_with_value
+
+x-db-credentials: &db-credentials                             # Use the default POSTGRES_ credentials if they're available or simply default to "listmonk"
+  POSTGRES_USER: &db-user listmonk                            # for database user, password, and database name
+  POSTGRES_PASSWORD: &db-password listmonk
+  POSTGRES_DB: &db-name listmonk
+
+services:
+  # listmonk app
+  app:
+    image: listmonk/listmonk:latest
+    container_name: listmonk_app
+    restart: unless-stopped
+    ports:
+      - "9000:9000"                                           # To change the externally exposed port, change to: $custom_port:9000
+    networks:
+      - listmonk
+    hostname: listmonk.example.com                            # Recommend using FQDN for hostname
+    depends_on:
+      - db
+    command: [sh, -c, "./listmonk --install --idempotent --yes --config '' && ./listmonk --upgrade --yes --config '' && ./listmonk --config ''"]
+                                                              # --config (file) param is set to empty so that listmonk only uses the env vars (below) for config.
+                                                              # --install --idempotent ensures that DB installation happens only once on an empty DB, on the first ever start.
+                                                              # --upgrade automatically runs any DB migrations when a new image is pulled.
+
+    environment:                                              # The same params as in config.toml are passed as env vars here.
+      LISTMONK_app__address: 0.0.0.0:9000
+      LISTMONK_db__user: *db-user
+      LISTMONK_db__password: *db-password
+      LISTMONK_db__database: *db-name
+      LISTMONK_db__host: listmonk_db
+      LISTMONK_db__port: 5432
+      LISTMONK_db__ssl_mode: disable
+      LISTMONK_db__max_open: 25
+      LISTMONK_db__max_idle: 25
+      LISTMONK_db__max_lifetime: 300s
+      TZ: Etc/UTC
+      LISTMONK_ADMIN_USER: ${LISTMONK_ADMIN_USER:-}           # If these (optional) are set during the first `docker compose up`, then the Super Admin user is automatically created.
+      LISTMONK_ADMIN_PASSWORD: ${LISTMONK_ADMIN_PASSWORD:-}   # Otherwise, the user can be setup on the web app after the first visit to http://localhost:9000
+    volumes:
+      - ./uploads:/listmonk/uploads:rw                        # Mount an uploads directory on the host to /listmonk/uploads inside the container.
+                                                              # To use this, change directory path in Admin -> Settings -> Media to /listmonk/uploads
+
+  # Postgres database
+  db:
+    image: postgres:17-alpine
+    container_name: listmonk_db
+    restart: unless-stopped
+    ports:
+      - "127.0.0.1:5432:5432"                                 # Only bind on the local interface. To connect to Postgres externally, change this to 0.0.0.0
+    networks:
+      - listmonk
+    environment:
+      <<: *db-credentials
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U listmonk"]
+      interval: 10s
+      timeout: 5s
+      retries: 6
+    volumes:
+      - type: volume
+        source: listmonk-data
+        target: /var/lib/postgresql/data
+
+networks:
+  listmonk:
+
+volumes:
+  listmonk-data:

zammad/docker-compose.yml

@@ -0,0 +1,227 @@
+---
+x-shared:
+  zammad-service: &zammad-service
+    environment: &zammad-environment
+      MEMCACHE_SERVERS: ${MEMCACHE_SERVERS:-zammad-memcached:11211}
+      POSTGRESQL_DB: ${POSTGRES_DB:-zammad_production}
+      POSTGRESQL_HOST: ${POSTGRES_HOST:-zammad-postgresql}
+      POSTGRESQL_USER: ${POSTGRES_USER:-zammad}
+      POSTGRESQL_PASS: ${POSTGRES_PASS:-zammad}
+      POSTGRESQL_PORT: ${POSTGRES_PORT:-5432}
+      POSTGRESQL_OPTIONS: ${POSTGRESQL_OPTIONS:-?pool=50}
+      POSTGRESQL_DB_CREATE:
+
+      REDIS_URL: ${REDIS_URL:-redis://zammad-redis:6379}
+      REDIS_SENTINELS:
+      REDIS_SENTINEL_NAME:
+      REDIS_USERNAME:
+      REDIS_PASSWORD:
+      REDIS_SENTINEL_USERNAME:
+      REDIS_SENTINEL_PASSWORD:
+
+      S3_URL:
+      BACKUP_DIR: "${BACKUP_DIR:-/var/tmp/zammad}"
+      BACKUP_TIME: "${BACKUP_TIME:-03:00}"
+      BACKUP_ON_START: "${BACKUP_ON_START:-true}"
+      HOLD_DAYS: "${HOLD_DAYS:-10}"
+      TZ: "${TZ:-Europe/Berlin}"
+
+      AUTOWIZARD_JSON:
+      AUTOWIZARD_RELATIVE_PATH:
+      ELASTICSEARCH_ENABLED:
+      ELASTICSEARCH_SCHEMA:
+      ELASTICSEARCH_HOST:
+      ELASTICSEARCH_PORT:
+      ELASTICSEARCH_USER:
+      ELASTICSEARCH_PASS:
+      ELASTICSEARCH_NAMESPACE:
+      ELASTICSEARCH_REINDEX:
+      NGINX_PORT:
+      NGINX_CLIENT_MAX_BODY_SIZE:
+      NGINX_SERVER_NAME:
+      NGINX_SERVER_SCHEME:
+      RAILS_TRUSTED_PROXIES:
+      ZAMMAD_HTTP_TYPE:
+      ZAMMAD_FQDN:
+      ZAMMAD_WEB_CONCURRENCY:
+      ZAMMAD_MANAGE_SESSIONS_JOBS_WORKERS:
+      ZAMMAD_PROCESS_SESSIONS_JOBS_WORKERS:
+      ZAMMAD_PROCESS_SCHEDULED_JOBS_WORKERS:
+      ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS:
+      ZAMMAD_PROCESS_DELAYED_JOBS_WORKER_THREADS:
+      ZAMMAD_PROCESS_DELAYED_AI_JOBS_WORKERS:
+      ZAMMAD_PROCESS_DELAYED_AI_JOBS_WORKER_THREADS:
+      ZAMMAD_PROCESS_DELAYED_COMMUNICATION_INBOUND_JOBS_WORKERS:
+      ZAMMAD_PROCESS_DELAYED_COMMUNICATION_INBOUND_JOBS_WORKER_THREADS:
+      ZAMMAD_OTRS_IMPORT_READ_TIMEOUT:
+      ZAMMAD_OTRS_IMPORT_TOTAL_TIMEOUT:
+      ZAMMAD_HTTP_OPEN_TIMEOUT:
+      ZAMMAD_HTTP_READ_TIMEOUT:
+      ZAMMAD_HTTP_TOTAL_TIMEOUT:
+      ZAMMAD_HTTP_AI_READ_TIMEOUT:
+      ZAMMAD_HTTP_AI_TOTAL_TIMEOUT:
+      ZAMMAD_HTTP_ELASTICSEARCH_READ_TIMEOUT:
+      ZAMMAD_HTTP_ELASTICSEARCH_TOTAL_TIMEOUT:
+      ZAMMAD_HTTP_ELASTICSEARCH_REINDEX_READ_TIMEOUT:
+      ZAMMAD_HTTP_ELASTICSEARCH_REINDEX_TOTAL_TIMEOUT:
+      ZAMMAD_HTTP_IMPORT_ATTACHMENT_READ_TIMEOUT:
+      ZAMMAD_HTTP_IMPORT_ATTACHMENT_TOTAL_TIMEOUT:
+      ZAMMAD_HTTP_WEBHOOK_READ_TIMEOUT:
+      ZAMMAD_HTTP_WEBHOOK_TOTAL_TIMEOUT:
+
+      ZAMMAD_PROCESS_SESSIONS_JOBS_DISABLE:
+      ZAMMAD_MANAGE_SESSIONS_JOBS_DISABLE:
+      ZAMMAD_PROCESS_SCHEDULED_JOBS_DISABLE:
+      ZAMMAD_PROCESS_DELAYED_JOBS_DISABLE:
+      ZAMMAD_PROCESS_DELAYED_AI_JOBS_DISABLE:
+      ZAMMAD_PROCESS_DELAYED_COMMUNICATION_INBOUND_JOBS_DISABLE:
+
+      ZAMMAD_GRAPHQL_INTROSPECTION:
+      ZAMMAD_AI_API_URL:
+      ZAMMAD_AI_TOKEN:
+      ZAMMAD_UI_BULK_BACKGROUND_UPDATE_THRESHOLD:
+      ZAMMAD_SETTING_TTL:
+      ZAMMAD_SAFE_MODE:
+      ZAMMAD_WEBSOCKET_SESSION_STORE_FORCE_FS_BACKEND:
+      ZAMMAD_RAILSSERVER_PORT:
+
+      ZAMMAD_SESSION_JOBS_CONCURRENT:
+      VIRTUAL_HOST:
+      VIRTUAL_PORT:
+      LETSENCRYPT_HOST:
+      LETSENCRYPT_EMAIL:
+
+    # image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-7.0.1-0053}
+    image: ghcr.io/zammad/zammad:6.5.0-101
+    restart: ${RESTART:-always}
+    env_file: .env
+    volumes:
+      - zammad-backup:/var/tmp/zammad:ro
+      - zammad-storage:/opt/zammad/storage
+    depends_on:
+      zammad-memcached:
+        condition: service_healthy
+      zammad-postgresql:
+        condition: service_healthy
+      zammad-redis:
+        condition: service_healthy
+
+services:
+  zammad-backup:
+    <<: *zammad-service
+    command: ["zammad-backup"]
+    volumes:
+      - zammad-backup:/var/tmp/zammad
+      - zammad-storage:/opt/zammad/storage
+    user: 0:0
+
+  zammad-elasticsearch:
+    image: elasticsearch:${ELASTICSEARCH_VERSION:-9.4.2}
+    restart: ${RESTART:-always}
+    volumes:
+      - elasticsearch-data:/usr/share/elasticsearch/data
+    environment:
+      discovery.type: single-node
+      xpack.security.enabled: "false"
+      ES_JAVA_OPTS: ${ELASTICSEARCH_JAVA_OPTS:--Xms1g -Xmx1g}
+
+  zammad-init:
+    <<: *zammad-service
+    command: ["zammad-init"]
+    depends_on:
+      zammad-postgresql:
+        condition: service_healthy
+    restart: on-failure
+    user: 0:0
+
+  zammad-memcached:
+    command: memcached -m 256M
+    image: memcached:${MEMCACHE_VERSION:-1.6.42-alpine}
+    restart: ${RESTART:-always}
+    healthcheck:
+      test: ["CMD", "nc", "-z", "127.0.0.1", "11211"]
+      interval: 10s
+      timeout: 5s
+      start_period: 10s
+      retries: 5
+
+  zammad-nginx:
+    <<: *zammad-service
+    command: ["zammad-nginx"]
+    expose:
+      - "${NGINX_PORT:-8080}"
+    networks:
+      - default
+      - proxy
+    depends_on:
+      zammad-railsserver:
+        condition: service_healthy
+
+  zammad-postgresql:
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB:-zammad_production}
+      POSTGRES_USER: ${POSTGRES_USER:-zammad}
+      POSTGRES_PASSWORD: ${POSTGRES_PASS:-zammad}
+    image: postgres:${POSTGRES_VERSION:-17.10-alpine}
+    restart: ${RESTART:-always}
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 10s
+      timeout: 5s
+      start_period: 60s
+      retries: 5
+
+  zammad-railsserver:
+    <<: *zammad-service
+    command: ["zammad-railsserver"]
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "curl",
+          "-sf",
+          "http://127.0.0.1:${ZAMMAD_RAILSSERVER_PORT:-3000}",
+        ]
+      interval: 30s
+      timeout: 5s
+      start_period: 120s
+      retries: 3
+
+  zammad-redis:
+    image: redis:${REDIS_VERSION:-8.8.0-alpine}
+    restart: ${RESTART:-always}
+    volumes:
+      - redis-data:/data
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      start_period: 10s
+      retries: 5
+
+  zammad-scheduler:
+    <<: *zammad-service
+    command: ["zammad-scheduler"]
+
+  zammad-websocket:
+    <<: *zammad-service
+    command: ["zammad-websocket"]
+
+volumes:
+  elasticsearch-data:
+    driver: local
+  postgresql-data:
+    driver: local
+  redis-data:
+    driver: local
+  zammad-backup:
+    driver: local
+  zammad-storage:
+    driver: local
+
+networks:
+  proxy:
+    external: true
+