From d87b51876be890754e199ba1109dde68de956a7c Mon Sep 17 00:00:00 2001
From: jkuensem <jkuensem@physik.uni-bielefeld.de>
Date: Fri, 31 Jan 2020 21:00:46 +0100
Subject: [PATCH] TMSS-138: Change client id in docker-compose to work for port
5005 by default
---
SAS/TMSS/docker/tmss-testenv/docker-compose.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
index 9220498435e..2aeb413ed58 100644
--- a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
+++ b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml
@@ -12,11 +12,7 @@ services:
- "tmss"
environment:
- OIDC_ENDPOINT_HOST=172.25.0.10
-<<<<<<< HEAD
- OIDC_RP_CLIENT_ID=1
-=======
- - OIDC_RP_CLIENT_ID=2
->>>>>>> TMSS-138: fixed docker compose setup for OIDC with static IP on bridge network
tmss_test_nginx:
build:
context: .
--
GitLab