diff --git a/.env.sample b/.env.sample index 1f19da4..47bcbb4 100644 --- a/.env.sample +++ b/.env.sample @@ -5,7 +5,6 @@ DOMAIN=karrot.example.com SECRET_DB_PASSWORD_VERSION=v1 SECRET_SECRET_KEY_VERSION=v1 SECRET_SMTP_PASSWORD_VERSION=v1 -SECRET_VAPID_PRIVATE_KEY_VERSION=v1 # account id for maxmind (for GeoIP) #MAXMIND_ACCOUNT_ID= @@ -16,11 +15,6 @@ SITE_LOGO=https://user-images.githubusercontent.com/31616/36565633-517373a4-1821 FILE_UPLOAD_MAX_SIZE=10m -# For web push set this, and the vapid private key secret -# You need to generate a valid vapid keypair -#VAPID_PUBLIC_KEY= -#VAPID_ADMIN_EMAIL= - # postal,smtp,console EMAIL_BACKEND=console @@ -41,6 +35,17 @@ EMAIL_BACKEND=console # only if you have configured incoming emails #EMAIL_REPLY_DOMAIN= +# For web push set this, and the vapid private key secret +# You need to generate a valid vapid keypair +#VAPID_PUBLIC_KEY= +#VAPID_ADMIN_EMAIL= +#SECRET_VAPID_PRIVATE_KEY_VERSION=v1 + +# for video calls +#MEET_LIVEKIT_ENDPOINT= +#MEET_LIVEKIT_API_KEY= +#SECRET_LIVEKIT_API_SECRET_VERSION=v1 + SITE_URL=https://${DOMAIN} LETS_ENCRYPT_ENV=production -CSRF_TRUSTED_ORIGINS=${SITE_URL} +CSRF_TRUSTED_ORIGINS=${SITE_URL} \ No newline at end of file diff --git a/compose.yml b/compose.yml index e5efb5e..001bfb8 100644 --- a/compose.yml +++ b/compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: web: - image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.4-frontend-beta" + image: "ghcr.io/karrot-dev/karrot-docker-images:13.0.0-frontend" configs: - source: nginx_config target: /etc/nginx/conf.d/default.conf @@ -34,7 +34,7 @@ services: - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" app: - image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.6-backend-beta" + image: "ghcr.io/karrot-dev/karrot-docker-images:13.0.0-backend" networks: - internal depends_on: @@ -97,6 +97,9 @@ services: - VAPID_ADMIN_EMAIL - VAPID_PUBLIC_KEY - VAPID_PRIVATE_KEY_FILE=/run/secrets/vapid_private_key + - MEET_LIVEKIT_ENDPOINT + - MEET_LIVEKIT_API_KEY + - MEET_LIVEKIT_API_SECRET_FILE=/run/secrets/livekit_api_secret healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/api/config/"] interval: 10s @@ -105,12 +108,12 @@ services: start_period: 45s deploy: labels: - - "coop-cloud.${STACK_NAME}.version=0.1.7+0.1.6" + - "coop-cloud.${STACK_NAME}.version=0.1.8+13.0.0" - "backupbot.backup=true" - "backupbot.backup.path=/app/uploads" worker: - image: "ghcr.io/karrot-dev/karrot-docker-images:0.1.6-backend-beta" + image: "ghcr.io/karrot-dev/karrot-docker-images:13.0.0-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 @@ -163,6 +166,9 @@ services: - VAPID_ADMIN_EMAIL - VAPID_PUBLIC_KEY - VAPID_PRIVATE_KEY_FILE=/run/secrets/vapid_private_key + - MEET_LIVEKIT_ENDPOINT + - MEET_LIVEKIT_API_KEY + - MEET_LIVEKIT_API_SECRET_FILE=/run/secrets/livekit_api_secret redis: image: "redis:6-alpine" @@ -231,6 +237,9 @@ secrets: vapid_private_key: external: true name: ${STACK_NAME}_vapid_private_key_${SECRET_VAPID_PRIVATE_KEY_VERSION} + livekit_api_secret: + external: true + name: ${STACK_NAME}_livekit_api_secret_${SECRET_LIVEKIT_API_SECRET_VERSION} volumes: shiv_data: