diff --git a/docker-compose.d/Documentation/bookstack.yml b/docker-compose.d/Documentation/bookstack.yml index e051032..633478a 100644 --- a/docker-compose.d/Documentation/bookstack.yml +++ b/docker-compose.d/Documentation/bookstack.yml @@ -6,7 +6,7 @@ services: - PUID=1000 - PGID=1000 - TZ=America/Chicago - - APP_URL=https://bookstack.mintyserver.net + - APP_URL=https://bookstack.archfox.org - APP_KEY=${BOOKKEY} - DB_HOST=bookstack_db - DB_PORT=3306 diff --git a/docker-compose.d/Documentation/vaultwarden.yml b/docker-compose.d/Documentation/vaultwarden.yml index 9cd3b83..da1f6c8 100644 --- a/docker-compose.d/Documentation/vaultwarden.yml +++ b/docker-compose.d/Documentation/vaultwarden.yml @@ -4,7 +4,7 @@ services: container_name: vaultwarden restart: unless-stopped environment: - DOMAIN: "https://vault.mintyserver.net" + DOMAIN: "https://vault.archfox.org" WEBSOCKET_ENABLED: true SIGNUPS_ALLOWED: false ADMIN_TOKEN: ${PASS} diff --git a/docker-compose.d/Media/shoko.yml b/docker-compose.d/Media/shoko.yml index 3da6a59..aebeb9c 100644 --- a/docker-compose.d/Media/shoko.yml +++ b/docker-compose.d/Media/shoko.yml @@ -2,7 +2,7 @@ services: shoko: shm_size: 256m container_name: shoko - image: shokoanime/server:daily + image: shokoanime/server:latest restart: always environment: - "PUID=1000" diff --git a/docker-compose.d/Networking/caddy.yml b/docker-compose.d/Networking/caddy.yml index 811d089..5805027 100644 --- a/docker-compose.d/Networking/caddy.yml +++ b/docker-compose.d/Networking/caddy.yml @@ -1,6 +1,6 @@ services: caddy: - image: caddy:latest + image: ghcr.io/caddybuilds/caddy-cloudflare:latest container_name: caddy restart: unless-stopped cap_add: @@ -15,6 +15,8 @@ services: - caddy_data:/data - piped-proxy:/var/run/ytproxy - caddy_config:/config + environment: + - CLOUDFLARE_API_TOKEN=${CF_CADDY_KEY} networks: - caddy diff --git a/docker-compose.d/Tools/searxng.yml b/docker-compose.d/Tools/searxng.yml index b958f47..cec158e 100644 --- a/docker-compose.d/Tools/searxng.yml +++ b/docker-compose.d/Tools/searxng.yml @@ -3,7 +3,7 @@ services: image: searxng/searxng:latest container_name: searxng environment: - - BASE_URL=https://searxng.mintyserver.net + - BASE_URL=https://searxng.archfox.org volumes: - searxng:/etc/searxng restart: unless-stopped diff --git a/docker-compose.d/piped.yml b/docker-compose.d/piped.yml deleted file mode 100644 index 0e2253e..0000000 --- a/docker-compose.d/piped.yml +++ /dev/null @@ -1,76 +0,0 @@ -services: - piped-frontend: - image: 1337kavin/piped-frontend:latest - restart: unless-stopped - depends_on: - - piped-backend - environment: - BACKEND_HOSTNAME: pipedapi.mintyserver.net - container_name: piped-frontend - networks: - - caddy - - piped-proxy: - image: 1337kavin/piped-proxy:latest - restart: unless-stopped - environment: - - UDS=1 - volumes: - - piped-proxy:/app/socket - container_name: piped-proxy - networks: - - caddy - - piped-backend: - image: 1337kavin/piped:latest - restart: unless-stopped - volumes: - - /etc/piped/config.properties:/app/config.properties - depends_on: - - postgres-piped - container_name: piped-backend - networks: - - piped - - caddy - - piped-nginx: - image: nginx:mainline-alpine - restart: unless-stopped - volumes: - - piped-nginx:/etc/nginx - #- ./config/nginx.conf:/etc/nginx/nginx.conf:ro - #- ./config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro - container_name: piped-nginx - depends_on: - - piped-backend - networks: - - caddy - - postgres-piped: - image: pgautoupgrade/pgautoupgrade:16-alpine - restart: unless-stopped - volumes: - - piped-db:/var/lib/postgresql/data - environment: - - POSTGRES_DB=piped - - POSTGRES_USER=piped - - POSTGRES_PASSWORD=${PASS} - container_name: postgres-piped - networks: - - piped - -volumes: - piped-proxy: null - piped-db: - external: true - piped-nginx: - external: true - piped-config: - external: true - -networks: - caddy: - external: true - piped: - external: true - diff --git a/scripts/run-all.sh b/scripts/run-all.sh index 25cbad0..2b06768 100755 --- a/scripts/run-all.sh +++ b/scripts/run-all.sh @@ -17,6 +17,7 @@ services=( "Networking/technitium.yml" "Networking/caddy.yml" "Networking/omada.yml" + "Networking/ddns.yml" "Tools/searxng.yml" "Tools/monerod.yml" "Tools/p2pool.yml" @@ -24,6 +25,7 @@ services=( "Tools/nextcloud-aio.yml" "Tools/qbit.yml" "Tools/open-webui.yml" + "Tools/watchtower.yml" "pterodactyl/docker-compose.yml" "Piped-Docker/docker-compose.yml" )