Update Docker stuff

This commit is contained in:
Joakim Hellsén 2024-02-19 06:10:26 +01:00
commit 03525fc04a
3 changed files with 20 additions and 11 deletions

View file

@ -13,6 +13,7 @@
"bthub", "bthub",
"Ceci", "Ceci",
"chartboost", "chartboost",
"cloudflared",
"congstar", "congstar",
"datetime", "datetime",
"dbname", "dbname",

View file

@ -6,8 +6,8 @@ services:
user: "1000:1000" user: "1000:1000"
restart: always restart: always
networks: networks:
- db - feedvault_db
- web - feedvault_web
environment: environment:
- SECRET_KEY=${SECRET_KEY} - SECRET_KEY=${SECRET_KEY}
- DEBUG=${DEBUG} - DEBUG=${DEBUG}
@ -18,10 +18,7 @@ services:
- POSTGRES_PORT=5432 - POSTGRES_PORT=5432
- POSTGRES_USER=feedvault - POSTGRES_USER=feedvault
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
- ADMIN_PAGE_PATH=${ADMIN_PAGE_PATH}
- DISCORD_WEBHOOK_URL=${DISCORD_WEBHOOK_URL} - DISCORD_WEBHOOK_URL=${DISCORD_WEBHOOK_URL}
volumes:
- /mnt/Fourteen/Docker/FeedVault/staticfiles:/app/staticfiles
# Nginx - Reverse proxy # Nginx - Reverse proxy
web: web:
@ -38,8 +35,19 @@ services:
volumes: volumes:
- /mnt/Fourteen/Docker/FeedVault/Nginx:/config - /mnt/Fourteen/Docker/FeedVault/Nginx:/config
networks: networks:
- web - feedvault_web
- tunnel - feedvault_tunnel
# Cloudflare Tunnel - Securely connect your server to Cloudflare
tunnel:
container_name: feedvault_tunnel
image: cloudflare/cloudflared:latest
command: tunnel --no-autoupdate run --token $TUNNEL_TOKEN
restart: always
networks:
- feedvault_tunnel
environment:
- TUNNEL_URL=http://web:80
# Postgres - Database # Postgres - Database
postgres: postgres:
@ -56,12 +64,12 @@ services:
volumes: volumes:
- /mnt/Fourteen/Docker/FeedVault/Postgres:/var/lib/postgresql/data - /mnt/Fourteen/Docker/FeedVault/Postgres:/var/lib/postgresql/data
networks: networks:
- db - feedvault_db
networks: networks:
tunnel: feedvault_tunnel:
driver: bridge driver: bridge
db: feedvault_db:
driver: bridge driver: bridge
web: feedvault_web:
driver: bridge driver: bridge

0
docker-entrypoint.sh Normal file → Executable file
View file