From d16fd7825adcc8b879663ad6e1344172127edf90 Mon Sep 17 00:00:00 2001 From: Justus Grunow Date: Wed, 13 Nov 2024 11:14:31 -0500 Subject: [PATCH] Added Docker image tags --- ansible/assets/docker-ext/compose.yml.j2 | 225 ++++++++++++----------- ansible/assets/docker-int/compose.yml.j2 | 4 +- 2 files changed, 115 insertions(+), 114 deletions(-) diff --git a/ansible/assets/docker-ext/compose.yml.j2 b/ansible/assets/docker-ext/compose.yml.j2 index 18c8001..a37ada6 100644 --- a/ansible/assets/docker-ext/compose.yml.j2 +++ b/ansible/assets/docker-ext/compose.yml.j2 @@ -1,3 +1,4 @@ +--- version: "3.5" services: traefik: @@ -105,7 +106,7 @@ services: volumes: - ./stalwart-mail:/opt/stalwart-mail container_name: stalwart-mail - image: stalwartlabs/mail-server:latest + image: stalwartlabs/mail-server:v0.10.6 labels: - "traefik.enable=true" - "traefik.http.routers.stalwart.rule=Host(`stalwart.mycomputer.party`)" @@ -154,7 +155,7 @@ services: linkding: container_name: "${LD_CONTAINER_NAME:-linkding}" - image: sissbruecker/linkding:latest-plus + image: sissbruecker/linkding:1.36.0-plus ports: - "${LD_HOST_PORT:-9090}:9090" volumes: @@ -173,7 +174,7 @@ services: wallabag: container_name: wallabag restart: unless-stopped - image: wallabag/wallabag + image: wallabag/wallabag:2.6.10 environment: # - MYSQL_ROOT_PASSWORD=wallaroot - POSTGRES_USER=wallabag @@ -217,7 +218,7 @@ services: timeout: 3s authentik-server: container_name: authentik-server - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.8.2} + image: ghcr.io/goauthentik/server:2024.8.2 restart: unless-stopped command: server environment: @@ -251,7 +252,7 @@ services: - "traefik.http.routers.authentik.middlewares=crowdsec@docker" authentik-worker: container_name: authentik-worker - image: ${AUTHENTIK_IMAGE:-ghcr.io/goauthentik/server}:${AUTHENTIK_TAG:-2024.8.2} + image: ghcr.io/goauthentik/server:2024.8.2 restart: unless-stopped command: worker environment: @@ -277,121 +278,121 @@ services: depends_on: - redis changedetection: - image: ghcr.io/dgtlmoon/changedetection.io - container_name: changedetection - hostname: changedetection - volumes: - - changedetection-data:/datastore -# Configurable proxy list support, see https://github.com/dgtlmoon/changedetection.io/wiki/Proxy-configuration#proxy-list-support -# - ./proxies.json:/datastore/proxies.json + image: ghcr.io/dgtlmoon/changedetection.io:0.47.06 + container_name: changedetection + hostname: changedetection + volumes: + - changedetection-data:/datastore + # Configurable proxy list support, see https://github.com/dgtlmoon/changedetection.io/wiki/Proxy-configuration#proxy-list-support + # - ./proxies.json:/datastore/proxies.json - environment: - # Default listening port, can also be changed with the -p option - # - PORT=5000 + environment: + # Default listening port, can also be changed with the -p option + # - PORT=5000 - # - PUID=1000 - # - PGID=1000 - # - # Log levels are in descending order. (TRACE is the most detailed one) - # Log output levels: TRACE, DEBUG(default), INFO, SUCCESS, WARNING, ERROR, CRITICAL - # - LOGGER_LEVEL=DEBUG - # - # Alternative WebDriver/selenium URL, do not use "'s or 's! - # - WEBDRIVER_URL=http://browser-chrome:4444/wd/hub - # - # WebDriver proxy settings webdriver_proxyType, webdriver_ftpProxy, webdriver_noProxy, - # webdriver_proxyAutoconfigUrl, webdriver_autodetect, - # webdriver_socksProxy, webdriver_socksUsername, webdriver_socksVersion, webdriver_socksPassword - # - # https://selenium-python.readthedocs.io/api.html#module-selenium.webdriver.common.proxy - # - # Alternative Playwright URL, do not use "'s or 's! - # - PLAYWRIGHT_DRIVER_URL=ws://playwright-chrome:3000 - # - # Playwright proxy settings playwright_proxy_server, playwright_proxy_bypass, playwright_proxy_username, playwright_proxy_password - # - # https://playwright.dev/python/docs/api/class-browsertype#browser-type-launch-option-proxy - # - # Plain requests - proxy support example. - # - HTTP_PROXY=socks5h://10.10.1.10:1080 - # - HTTPS_PROXY=socks5h://10.10.1.10:1080 - # - # An exclude list (useful for notification URLs above) can be specified by with - # - NO_PROXY="localhost,192.168.0.0/24" - # - # Base URL of your changedetection.io install (Added to the notification alert) - - BASE_URL=https://changedetection.mycomputer.party - # Respect proxy_pass type settings, `proxy_set_header Host "localhost";` and `proxy_set_header X-Forwarded-Prefix /app;` - # More here https://github.com/dgtlmoon/changedetection.io/wiki/Running-changedetection.io-behind-a-reverse-proxy-sub-directory - - USE_X_SETTINGS=1 - # - # Hides the `Referer` header so that monitored websites can't see the changedetection.io hostname. - # - HIDE_REFERER=true - # - # Default number of parallel/concurrent fetchers - # - FETCH_WORKERS=10 + # - PUID=1000 + # - PGID=1000 + # + # Log levels are in descending order. (TRACE is the most detailed one) + # Log output levels: TRACE, DEBUG(default), INFO, SUCCESS, WARNING, ERROR, CRITICAL + # - LOGGER_LEVEL=DEBUG + # + # Alternative WebDriver/selenium URL, do not use "'s or 's! + # - WEBDRIVER_URL=http://browser-chrome:4444/wd/hub + # + # WebDriver proxy settings webdriver_proxyType, webdriver_ftpProxy, webdriver_noProxy, + # webdriver_proxyAutoconfigUrl, webdriver_autodetect, + # webdriver_socksProxy, webdriver_socksUsername, webdriver_socksVersion, webdriver_socksPassword + # + # https://selenium-python.readthedocs.io/api.html#module-selenium.webdriver.common.proxy + # + # Alternative Playwright URL, do not use "'s or 's! + # - PLAYWRIGHT_DRIVER_URL=ws://playwright-chrome:3000 + # + # Playwright proxy settings playwright_proxy_server, playwright_proxy_bypass, playwright_proxy_username, playwright_proxy_password + # + # https://playwright.dev/python/docs/api/class-browsertype#browser-type-launch-option-proxy + # + # Plain requests - proxy support example. + # - HTTP_PROXY=socks5h://10.10.1.10:1080 + # - HTTPS_PROXY=socks5h://10.10.1.10:1080 + # + # An exclude list (useful for notification URLs above) can be specified by with + # - NO_PROXY="localhost,192.168.0.0/24" + # + # Base URL of your changedetection.io install (Added to the notification alert) + - BASE_URL=https://changedetection.mycomputer.party + # Respect proxy_pass type settings, `proxy_set_header Host "localhost";` and `proxy_set_header X-Forwarded-Prefix /app;` + # More here https://github.com/dgtlmoon/changedetection.io/wiki/Running-changedetection.io-behind-a-reverse-proxy-sub-directory + - USE_X_SETTINGS=1 + # + # Hides the `Referer` header so that monitored websites can't see the changedetection.io hostname. + # - HIDE_REFERER=true + # + # Default number of parallel/concurrent fetchers + # - FETCH_WORKERS=10 - # Comment out ports: when using behind a reverse proxy , enable networks: etc. - ports: - - 5000:5000 - restart: unless-stopped - labels: - - "traefik.enable=true" - - "traefik.http.routers.changedetection.rule=Host(`changedetection.mycomputer.party`)" - - "traefik.http.routers.changedetection.entrypoints=websecure" - - "traefik.http.routers.changedetection.tls.certresolver=myresolver" - - "traefik.http.routers.changedetection.tls=true" - - "traefik.http.services.changedetection-http.loadbalancer.server.port=5000" - - "traefik.http.routers.changedetection.middlewares=authchain@docker" + # Comment out ports: when using behind a reverse proxy , enable networks: etc. + ports: + - 5000:5000 + restart: unless-stopped + labels: + - "traefik.enable=true" + - "traefik.http.routers.changedetection.rule=Host(`changedetection.mycomputer.party`)" + - "traefik.http.routers.changedetection.entrypoints=websecure" + - "traefik.http.routers.changedetection.tls.certresolver=myresolver" + - "traefik.http.routers.changedetection.tls=true" + - "traefik.http.services.changedetection-http.loadbalancer.server.port=5000" + - "traefik.http.routers.changedetection.middlewares=authchain@docker" - # Used for fetching pages via WebDriver+Chrome where you need Javascript support. - # Now working on arm64 (needs testing on rPi - tested on Oracle ARM instance) - # replace image with seleniarm/standalone-chromium:4.0.0-20211213 + # Used for fetching pages via WebDriver+Chrome where you need Javascript support. + # Now working on arm64 (needs testing on rPi - tested on Oracle ARM instance) + # replace image with seleniarm/standalone-chromium:4.0.0-20211213 - # If WEBDRIVER or PLAYWRIGHT are enabled, changedetection container depends on that - # and must wait before starting (substitute "browser-chrome" with "playwright-chrome" if last one is used) - # depends_on: - # browser-chrome: - # condition: service_started + # If WEBDRIVER or PLAYWRIGHT are enabled, changedetection container depends on that + # and must wait before starting (substitute "browser-chrome" with "playwright-chrome" if last one is used) + # depends_on: + # browser-chrome: + # condition: service_started - # Used for fetching pages via Playwright+Chrome where you need Javascript support. - # RECOMMENDED FOR FETCHING PAGES WITH CHROME - # playwright-chrome: - # hostname: playwright-chrome - # image: dgtlmoon/sockpuppetbrowser:latest - # cap_add: - # - SYS_ADMIN - ## SYS_ADMIN might be too much, but it can be needed on your platform https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#running-puppeteer-on-gitlabci - # restart: unless-stopped - # environment: - # - SCREEN_WIDTH=1920 - # - SCREEN_HEIGHT=1024 - # - SCREEN_DEPTH=16 - # - MAX_CONCURRENT_CHROME_PROCESSES=10 + # Used for fetching pages via Playwright+Chrome where you need Javascript support. + # RECOMMENDED FOR FETCHING PAGES WITH CHROME + # playwright-chrome: + # hostname: playwright-chrome + # image: dgtlmoon/sockpuppetbrowser:latest + # cap_add: + # - SYS_ADMIN + ## SYS_ADMIN might be too much, but it can be needed on your platform https://github.com/puppeteer/puppeteer/blob/main/docs/troubleshooting.md#running-puppeteer-on-gitlabci + # restart: unless-stopped + # environment: + # - SCREEN_WIDTH=1920 + # - SCREEN_HEIGHT=1024 + # - SCREEN_DEPTH=16 + # - MAX_CONCURRENT_CHROME_PROCESSES=10 - # Used for fetching pages via Playwright+Chrome where you need Javascript support. - # Note: Works well but is deprecated, does not fetch full page screenshots (doesnt work with Visual Selector) - # Does not report status codes (200, 404, 403) and other issues - # browser-chrome: - # hostname: browser-chrome - # image: selenium/standalone-chrome:4 - # environment: - # - VNC_NO_PASSWORD=1 - # - SCREEN_WIDTH=1920 - # - SCREEN_HEIGHT=1080 - # - SCREEN_DEPTH=24 - # volumes: - # # Workaround to avoid the browser crashing inside a docker container - # # See https://github.com/SeleniumHQ/docker-selenium#quick-start - # - /dev/shm:/dev/shm - # restart: unless-stopped + # Used for fetching pages via Playwright+Chrome where you need Javascript support. + # Note: Works well but is deprecated, does not fetch full page screenshots (doesnt work with Visual Selector) + # Does not report status codes (200, 404, 403) and other issues + # browser-chrome: + # hostname: browser-chrome + # image: selenium/standalone-chrome:4 + # environment: + # - VNC_NO_PASSWORD=1 + # - SCREEN_WIDTH=1920 + # - SCREEN_HEIGHT=1080 + # - SCREEN_DEPTH=24 + # volumes: + # # Workaround to avoid the browser crashing inside a docker container + # # See https://github.com/SeleniumHQ/docker-selenium#quick-start + # - /dev/shm:/dev/shm + # restart: unless-stopped healthchecks: container_name: healthchecks restart: unless-stopped # To use a pre-built image, remove the above "build" section # and uncomment the following line: - image: healthchecks/healthchecks:latest + image: healthchecks/healthchecks:v3.7 env_file: - .healthchecks-env ports: @@ -466,7 +467,7 @@ services: # - net.ipv4.conf.all.src_valid_mark=1 # restart: unless-stopped crowdsec: - image: crowdsecurity/crowdsec + image: crowdsecurity/crowdsec:v1.6.3 container_name: crowdsec environment: PGID: "1001" @@ -493,14 +494,14 @@ services: - proxy - backend ddns-updater: - image: docker.io/qmcgaw/ddns-updater + image: docker.io/qmcgaw/ddns-updater:v2.8 container_name: ddns-updater ports: - 8014:8000 volumes: - ./ddns-updater:/updater/data bookstack: - image: lscr.io/linuxserver/bookstack + image: lscr.io/linuxserver/bookstack:v24.10.1-ls173 container_name: bookstack environment: - PUID=1000 @@ -528,7 +529,7 @@ services: - "traefik.http.routers.bookstack.tls.certresolver=myresolver" - "traefik.http.routers.bookstack.tls=true" bookstack_db: - image: lscr.io/linuxserver/mariadb + image: lscr.io/linuxserver/mariadb:v24.10.1-ls173 container_name: bookstack_db environment: - PUID=1000 @@ -542,7 +543,7 @@ services: - ./bookstack_db_data:/config restart: unless-stopped wikijs: - image: ghcr.io/requarks/wiki:2 + image: ghcr.io/requarks/wiki:2.5.305 container_name: wikijs environment: DB_TYPE: postgres diff --git a/ansible/assets/docker-int/compose.yml.j2 b/ansible/assets/docker-int/compose.yml.j2 index d1bd799..f5092b6 100644 --- a/ansible/assets/docker-int/compose.yml.j2 +++ b/ansible/assets/docker-int/compose.yml.j2 @@ -69,7 +69,7 @@ services: # POSTGRES_USER: paperless # POSTGRES_PASSWORD: paperless paperless-webserver: - image: ghcr.io/paperless-ngx/paperless-ngx:latest + image: ghcr.io/paperless-ngx/paperless-ngx:2.7.2 container_name: paperless-webserver restart: unless-stopped depends_on: @@ -127,7 +127,7 @@ services: - "traefik.http.routers.testweb.entrypoints=websecure" - "traefik.http.routers.testweb.tls.certresolver=myresolver" actual_server: - image: docker.io/actualbudget/actual-server:latest + image: docker.io/actualbudget/actual-server:24.11.0 ports: # This line makes Actual available at port 5006 of the device you run the server on, # i.e. http://localhost:5006. You can change the first number to change the port, if you want.