From 6617d56782b06967411efa14c98bbbbfee491bb9 Mon Sep 17 00:00:00 2001 From: jaydee Date: Thu, 6 Mar 2025 16:58:36 +0100 Subject: [PATCH] alias --- authentik/docker-compose.yml | 10 ++-- bookstack/docker-compose copy.yml | 78 ------------------------------- watchtower/stack.env | 8 ++++ 3 files changed, 13 insertions(+), 83 deletions(-) delete mode 100644 bookstack/docker-compose copy.yml diff --git a/authentik/docker-compose.yml b/authentik/docker-compose.yml index 9ccf932..b753673 100644 --- a/authentik/docker-compose.yml +++ b/authentik/docker-compose.yml @@ -7,7 +7,7 @@ version: "3.4" #AUTHENTIK_ERROR_REPORTING__ENABLED true services: postgresql: - image: docker.io/library/postgres:16-alpine + image: ${DOCKER_REGISTRY:-docker.io/library/}postgres:16-alpine restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] @@ -25,7 +25,7 @@ services: TZ: Europe/Bratislava redis: - image: docker.io/library/redis:alpine + image: ${DOCKER_REGISTRY:-docker.io/library/}redis:alpine command: --save 60 1 --loglevel warning restart: unless-stopped healthcheck: @@ -37,7 +37,7 @@ services: volumes: - redis:/data server: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.6.1} + image: ${DOCKER_REGISTRY:-}ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2024.6.1} restart: unless-stopped command: server @@ -72,7 +72,7 @@ services: - homepage.widget.url=https://auth.sectorq.eu - homepage.widget.key=sVOwPPInTue7ZnvolmKG15hkE9gCyLcuAelLOQny6OIVn7JUilny9loPTG0v worker: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.6.1} + image: ${DOCKER_REGISTRY:-}ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2024.6.1} restart: unless-stopped command: worker environment: @@ -99,7 +99,7 @@ services: - postgresql - redis authentik_ldap: - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/ldap}:${AUTHENTIK_TAG:-2024.6.1} + image: ${DOCKER_REGISTRY:-}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: diff --git a/bookstack/docker-compose copy.yml b/bookstack/docker-compose copy.yml deleted file mode 100644 index f90da9a..0000000 --- a/bookstack/docker-compose copy.yml +++ /dev/null @@ -1,78 +0,0 @@ ---- -version: "2" -services: - app: - image: lscr.io/linuxserver/bookstack:latest - environment: - PUID: 1000 - PGID: 1000 - APP_URL: https://bookstack.sectorq.eu - DB_HOST: db - DB_PORT: 3306 - DB_USER: bookstack - DB_PASS: l4c1j4yd33Du5lo - DB_DATABASE: bookstackapp - # Set authentication method to be saml2 - AUTH_METHOD: saml2 - # Control if BookStack automatically initiates login via your SAML system if it's the only authentication method. - # Prevents the need for the user to click the "Login with x" button on the login page. - # Setting this to true enables auto-initiation. - AUTH_AUTO_INITIATE: true - # Set the display name to be shown on the login button. - # (Login with ) - SAML2_NAME: authentik - # Name of the attribute which provides the user's email address - SAML2_EMAIL_ATTRIBUTE: email - # Name of the attribute to use as an ID for the SAML user. - SAML2_EXTERNAL_ID_ATTRIBUTE: uid - # Enable SAML group sync. - SAML2_USER_TO_GROUPS: true - # Set the attribute from which BookStack will read groups names from. - # You will need to rename your roles in Bookstack to match your groups in authentik. - SAML2_GROUP_ATTRIBUTE: http://schemas.xmlsoap.org/claims/Group - # Name of the attribute(s) to use for the user's display name - # Can have multiple attributes listed, separated with a '|' in which - # case those values will be joined with a space. - # Example: SAML2_DISPLAY_NAME_ATTRIBUTES=firstName|lastName - # Defaults to the ID value if not found. - SAML2_DISPLAY_NAME_ATTRIBUTES: http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname - # Identity Provider entityID URL - SAML2_IDP_ENTITYID: https://auth.sectorq.eu/api/v3/providers/saml/10/metadata/?download - # Auto-load metadata from the IDP - # Setting this to true negates the need to specify the next three options - SAML2_AUTOLOAD_METADATA: true - volumes: - - /share/docker_data/bookstack/bookstack_app_data:/config - ports: - - 6875:80 - restart: always - depends_on: - - db - labels: - com.centurylinklabs.watchtower.enable: true - homepage.group: Utilities - homepage.name: Bookstack - homepage.weight: 1 - homepage.icon: bookstack.png - homepage.href: https://bookstack.sectorq.eu - homepage.description: Books - homepage.server: my-docker - homepage.container: bookstack-app-1 - # homepage.widget.type: ${APPNAME} - # homepage.widget.url: https://${APPNAME}.sectorq.eu - # homepage.widget.key: ddfc91b29920082636da70cc677aec74c88a7666 - # homepage.widget.version: 2 - db: - image: lscr.io/linuxserver/mariadb - environment: - PUID: 0 - PGID: 0 - MYSQL_ROOT_PASSWORD: l4c1j4yd33Du5lo - TZ: Europe/Bratislava - MYSQL_DATABASE: bookstackapp - MYSQL_USER: bookstack - MYSQL_PASSWORD: l4c1j4yd33Du5lo - - volumes: - - /share/docker_data/bookstack/bookstack_db_data:/config - restart: always diff --git a/watchtower/stack.env b/watchtower/stack.env index e69de29..2a47ad9 100644 --- a/watchtower/stack.env +++ b/watchtower/stack.env @@ -0,0 +1,8 @@ +WATCHTOWER_NOTIFICATIONS=email +WATCHTOWER_NOTIFICATION_EMAIL_FROM=jaydee@sectorq.eu +WATCHTOWER_NOTIFICATION_EMAIL_TO=jaydee@sectorq.eu +WATCHTOWER_NOTIFICATION_EMAIL_SERVER=mail.sectorq.eu +WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT=25 +WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=jaydee@sectorq.eu +WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=l4c1j4yd33Du5lo +WATCHTOWER_NOTIFICATION_EMAIL_DELAY=2