Compare commits

...

3 Commits

Author SHA1 Message Date
Nick Sellen 39816dcf54
Version bumps 2023-10-19 19:04:39 +01:00
Nick Sellen 8c6a6202d4
Set MODE=prod and bump frontend image 2023-10-19 19:03:27 +01:00
Nick Sellen 96b3c0f9dd
Configure default CSRF_TRUSTED_ORIGINS 2023-10-19 19:03:05 +01:00
2 changed files with 8 additions and 6 deletions

View File

@ -8,7 +8,7 @@ SECRET_SMTP_PASSWORD_VERSION=v1
# account id for maxmind (for GeoIP)
#MAXMIND_ACCOUNT_ID=
#SECRET_MAXMIND_LICENSE_KEY_VERSION=v1
SECRET_MAXMIND_LICENSE_KEY_VERSION=v1
SITE_NAME=karrot dev
SITE_LOGO=https://user-images.githubusercontent.com/31616/36565633-517373a4-1821-11e8-9948-5bf6887c667e.png
@ -26,4 +26,4 @@ EMAIL_BACKEND=console
SITE_URL=https://${DOMAIN}
LETS_ENCRYPT_ENV=production
CSRF_TRUSTED_ORIGINS=${SITE_URL}

View File

@ -2,7 +2,7 @@ version: "3.8"
services:
web:
image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.1-frontend"
image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.2-frontend"
configs:
- source: nginx_config
target: /etc/nginx/conf.d/default.conf
@ -33,7 +33,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
app:
image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.2-backend"
image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.3-backend"
networks:
- internal
depends_on:
@ -57,6 +57,7 @@ services:
- "geoip_data:/var/lib/GeoIP"
- "app_data:/app/uploads"
environment:
- MODE=prod
- MAXMIND_ACCOUNT_ID
- EMAIL_BACKEND
- EMAIL_FROM
@ -89,10 +90,10 @@ services:
start_period: 45s
deploy:
labels:
- "coop-cloud.${STACK_NAME}.version=0.1.2+0.1.2"
- "coop-cloud.${STACK_NAME}.version=0.1.3+0.1.3"
worker:
image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.2-backend"
image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.3-backend"
depends_on:
# shiv + geoip data gets loaded on the first run of the app
# so to ensure it's available in the worker too, we need to wait
@ -112,6 +113,7 @@ services:
- secret_key
- smtp_password
environment:
- MODE=prod
- SITE_URL
- SMTP_USER
- SMTP_HOST