alias

2025-07-01 16:08:32 +02:00 · 2025-03-02 16:01:37 +01:00
parent 0becfe390e
commit ae420f7a2e
4 changed files with 17 additions and 100 deletions
--- a/authentik/docker-compose.yml
+++ b/authentik/docker-compose.yml
@ -1,13 +1,11 @@
 ---
-version: "3.4"
-

 #PG_PASS 499NU6Ze5HcJK4IwSShO8oDbj3j0i0CalyEzfgEp
 #AUTHENTIK_SECRET_KEY ZKkVCxj8kKj5ZklvzxKG2IgYQOftDoLPRjc57yomr1qzbKEQVZ
 #AUTHENTIK_ERROR_REPORTING__ENABLED true
 services:
  postgresql:
-    image: docker.io/library/postgres:12-alpine
+    image: docker.io/library/postgres:16-alpine
    restart: unless-stopped
    healthcheck:
      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
@ -22,6 +20,7 @@ services:
      POSTGRES_USER: ${PG_USER:-authentik}
      POSTGRES_DB: ${PG_DB:-authentik}
      AUTHENTIK_SECRET_KEY: $AUTHENTIK_SECRET_KEY
+      TZ: Europe/Bratislava

  redis:
    image: docker.io/library/redis:alpine
@ -36,7 +35,7 @@ services:
    volumes:
      - redis:/data
  server:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.4.2}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.6.1}
    restart: unless-stopped
    command: server
    
@ -47,6 +46,7 @@ services:
      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
      AUTHENTIK_SECRET_KEY: $AUTHENTIK_SECRET_KEY
+      TZ: Europe/Bratislava
    volumes:
      - /share/docker_data/authentik/media:/media
      - /share/docker_data/authentik/custom-templates:/templates
@ -58,7 +58,7 @@ services:
      - postgresql
      - redis
  worker:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.4.2}
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.6.1}
    restart: unless-stopped
    command: worker
    environment:
@ -68,6 +68,7 @@ services:
      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
      AUTHENTIK_SECRET_KEY: $AUTHENTIK_SECRET_KEY
+      TZ: Europe/Bratislava
    # `user: root` and the docker socket volume are optional.
    # See more for the docker socket integration here:
    # https://goauthentik.io/docs/outposts/integrations/docker
@ -84,18 +85,20 @@ services:
      - postgresql
      - redis
  authentik_ldap:
-    image: ghcr.io/goauthentik/ldap
+    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/ldap}:${AUTHENTIK_TAG:-2024.6.1}
    # Optionally specify which networks the container should be
    # might be needed to reach the core authentik server
    # networks:
    #   - foo
    ports:
-        - 389:3389
-        - 636:6636
+        - 2389:3389
+        - 2636:6636
+    restart: unless-stopped
    environment:
        AUTHENTIK_HOST: https://auth.sectorq.eu
        AUTHENTIK_INSECURE: "false"
-        AUTHENTIK_TOKEN: UwVh9weo2OymSrBOULnhR2te8NIyls8a1sq58ncC8ijGr6iuox3syjVRBivs
+        AUTHENTIK_TOKEN: EfLokorVuj1woeO0p1he3mRJvVfGfvdKM8Bdew3DtDZZ3To6bVpFSDI7GOqY
+        TZ: Europe/Bratislava
 volumes:
  database:
    driver: local
--- a/authentik/docker-compose2.yml
+++ b/authentik/docker-compose2.yml
@ -1,87 +0,0 @@
---
-version: "3.4"
-
-services:
-  postgresql:
-    image: docker.io/library/postgres:12-alpine
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
-      start_period: 20s
-      interval: 30s
-      retries: 5
-      timeout: 5s
-    volumes:
-      - database:/var/lib/postgresql/data
-    environment:
-      POSTGRES_PASSWORD: ${PG_PASS:?database password required}
-      POSTGRES_USER: ${PG_USER:-authentik}
-      POSTGRES_DB: ${PG_DB:-authentik}
-    env_file:
-      - stack.env
-  redis:
-    image: docker.io/library/redis:alpine
-    command: --save 60 1 --loglevel warning
-    restart: unless-stopped
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping | grep PONG"]
-      start_period: 20s
-      interval: 30s
-      retries: 5
-      timeout: 3s
-    volumes:
-      - redis:/data
-  server:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.1}
-    restart: unless-stopped
-    command: server
-    environment:
-      AUTHENTIK_REDIS__HOST: redis
-      AUTHENTIK_POSTGRESQL__HOST: postgresql
-      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
-      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
-      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
-    volumes:
-      - /share/docker_data/authentik/media:/media
-      - /share/docker_data/authentik/custom-templates:/templates
-    env_file:
-      - stack.env
-    ports:
-      - "${COMPOSE_PORT_HTTP:-9003}:9000"
-      - "${COMPOSE_PORT_HTTPS:-9453}:9443"
-    depends_on:
-      - postgresql
-      - redis
-  worker:
-    image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2023.10.1}
-    restart: unless-stopped
-    command: worker
-    environment:
-      AUTHENTIK_REDIS__HOST: redis
-      AUTHENTIK_POSTGRESQL__HOST: postgresql
-      AUTHENTIK_POSTGRESQL__USER: ${PG_USER:-authentik}
-      AUTHENTIK_POSTGRESQL__NAME: ${PG_DB:-authentik}
-      AUTHENTIK_POSTGRESQL__PASSWORD: ${PG_PASS}
-    # `user: root` and the docker socket volume are optional.
-    # See more for the docker socket integration here:
-    # https://goauthentik.io/docs/outposts/integrations/docker
-    # Removing `user: root` also prevents the worker from fixing the permissions
-    # on the mounted folders, so when removing this make sure the folders have the correct UID/GID
-    # (1000:1000 by default)
-    user: root
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /share/docker_data/authentik/media:/media
-      - /share/docker_data/authentik/certs:/certs
-      - /share/docker_data/authentik/custom-templates:/templates
-    env_file:
-      - stack.env
-    depends_on:
-      - postgresql
-      - redis
-
-volumes:
-  database:
-    driver: local
-  redis:
-    driver: local
--- a/immich/docker-compose.yml
+++ b/immich/docker-compose.yml
@ -34,13 +34,13 @@ services:
    labels:
      - homepage.group=Media
      - homepage.name=Immich
-      - homepage.icon=immich.png
-      - homepage.href=https://immich.sectorq.eu
+      - homepage.icon=`${APPNAME}`.png
+      - homepage.href=https://`${APPNAME}`.sectorq.eu
      - homepage.description=Photo server
      - homepage.server=my-docker
      - homepage.container=immich_server
-      - homepage.widget.type=immich
-      - homepage.widget.url=https://immich.sectorq.eu
+      - homepage.widget.type=`${APPNAME}`
+      - homepage.widget.url=https://`${APPNAME}`.sectorq.eu
      - homepage.widget.key=wVxjlztA8MpeuzKkNGCSUPK2WjAY55qq4cfs9Zr5opU
      - homepage.widget.version=2
      # - homepage.widget.fields=["field1","field2"] # optional
--- a/immich/stack.env
+++ b/immich/stack.env
@ -21,3 +21,4 @@ DB_USERNAME=postgres
 DB_DATABASE_NAME=immich
 IMMICH_INSTANCE_URL=https://immich.sectorq.eu/api
 IMMICH_API_KEY=l4c1j4yd33Du5lo
+APPNAME=immich