From 74b6bd77088527253cfc436688b92b4a4535fa17 Mon Sep 17 00:00:00 2001
From: Mark <mark@openappstack.net>
Date: Fri, 27 Mar 2020 11:02:15 +0100
Subject: [PATCH] Replace fixed Ips with hostnames
---
.gitlab-ci.yml | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd1c1b7..8ef5168 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,19 +78,19 @@ behave-integration:
# it assigns addresses incrementally starting from 172.17.0.2
# in the order that the services are started which is the order of
# the services listed in the job configuration
- DATABASE_HOST: "172.17.0.2" # 172.17.0.2 -> postgres
- URLS_LOGIN: "http://172.17.0.3:5000/login" # 172.17.0.3 -> login
- URLS_LOGOUT: "http://172.17.0.3:5000/logout"
- LOGOUT_URL: "http://172.17.0.3:5000/logout"
- URLS_POST_LOGOUT_REDIRECT: "http://172.17.0.3:5000/"
- URLS_CONSENT: "http://172.17.0.4:5001/consent" # 172.17.0.4 -> consent
- URLS_SELF_ISSUER: "http://172.17.0.5:4444/" # 172.17.0.5 -> hydra
- BASE_URL: "http://172.17.0.5:4444/"
- HYDRA_ADMIN_URL: "http://172.17.0.5:4445"
- ACCESS_TOKEN_URL: "http://172.17.0.5:4444/oauth2/token"
- AUTHORIZE_URL: "http://172.17.0.5:4444/oauth2/auth"
- USERINFO_URL: "http://172.17.0.5:4444/userinfo"
- GRAPHQL_URL: "http://172.17.0.6:5000/graphql" # 172.17.0.6 -> backend
+ DATABASE_HOST: "postgres"
+ URLS_LOGIN: "login:5000/login"
+ URLS_LOGOUT: "login:5000/logout"
+ LOGOUT_URL: "login/logout"
+ URLS_POST_LOGOUT_REDIRECT: "login:5000/"
+ URLS_CONSENT: "consent:5001/consent"
+ URLS_SELF_ISSUER: "hydra:4444/"
+ BASE_URL: "hydra:4444/"
+ HYDRA_ADMIN_URL: "hydra:4445"
+ ACCESS_TOKEN_URL: "hydra:4444/oauth2/token"
+ AUTHORIZE_URL: "hydra:4444/oauth2/auth"
+ USERINFO_URL: "hydra:4444/userinfo"
+ GRAPHQL_URL: "backend:5000/graphql"
GIT_SUBMODULE_STRATEGY: "recursive"
TESTUSER_USERNAME: "testuser"
TESTUSER_USERNAME2: "testuser2"
--
GitLab