From d1fc425f488abe41498b4879cd9c363f165f8853 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Tue, 26 Sep 2023 15:02:02 +0200
Subject: [PATCH] Update docker compose file examples
---
docker-compose/docker-compose.development.yml | 1 +
docker-compose/docker-compose.traefik.yml | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/docker-compose/docker-compose.development.yml b/docker-compose/docker-compose.development.yml
index 3ae1b9c5..84ce2fa3 100644
--- a/docker-compose/docker-compose.development.yml
+++ b/docker-compose/docker-compose.development.yml
@@ -11,6 +11,7 @@ services:
- "./app:/home/nopaque/app"
- "./boot.sh:/home/nopaque/boot.sh"
- "./config.py:/home/nopaque/config.py"
+ - "./docker-entrypoint.sh:/home/nopaque/docker-entrypoint.sh"
- "./migrations:/home/nopaque/migrations"
- "./nopaque.py:/home/nopaque/nopaque.py"
- "./requirements.txt:/home/nopaque/requirements.txt"
diff --git a/docker-compose/docker-compose.traefik.yml b/docker-compose/docker-compose.traefik.yml
index d0f7f4d3..51655c5c 100644
--- a/docker-compose/docker-compose.traefik.yml
+++ b/docker-compose/docker-compose.traefik.yml
@@ -1,7 +1,3 @@
-################################################################################
-# Don't forget to set the proxy variables in your nopaque.env #
-# Traefik sets the X_FOR, X_HOST, X_PORT and X_PROTO headers by default #
-################################################################################
version: "3.5"
networks:
@@ -11,6 +7,12 @@ networks:
services:
nopaque:
+ environment:
+ - NOPAQUE_PROXY_FIX_X_FOR=1
+ - NOPAQUE_PROXY_FIX_X_HOST=1
+ - NOPAQUE_PROXY_FIX_X_PORT=1
+ - NOPAQUE_PROXY_FIX_X_PREFIX=0
+ - NOPAQUE_PROXY_FIX_X_PROTO=1
labels:
- "traefik.docker.network=traefik"
- "traefik.enable=true"
--
GitLab