TMSS-138: Modify docker compose setup for testenv to include OIDC test provider

SAS/TMSS/docker/tmss-testenv/docker-compose.yml

@@ -20,8 +20,6 @@ services:
     container_name: tmss_test_nginx
     ports:
       - "5005:5005"
-    networks:
-      - "tmss"
   tmss_test_oidc:
     build:
       context: ../../test/oidc/docker-test-mozilla-django-oidc/
@@ -29,9 +27,6 @@ services:
     container_name: tmss_test_oidc
     ports:
       - "8088:8088"
-    networks:
-      tmss:
-        ipv4_address: 172.25.0.10
 networks:
   tmss:
     driver: bridge

SAS/TMSS/src/tmss/settings.py

@@ -200,13 +200,14 @@ if "OIDC_RP_CLIENT_ID" in os.environ.keys():
     #OIDC_OP_TOKEN_ENDPOINT = "https://localhost:9090/token"
     #OIDC_OP_USER_ENDPOINT = "https://localhost:9090/userinfo"
 
-
     # For talking to Mozilla Identity Provider:
-    OIDC_RP_CLIENT_ID = os.environ.get('OIDC_RP_CLIENT_ID', '1')               # Secret, do not put real credentials on Git
-    OIDC_RP_CLIENT_SECRET = os.environ.get('OIDC_RP_CLIENT_SECRET', 'secret')       # Secret, do not put real credentials on Git
-    OIDC_OP_AUTHORIZATION_ENDPOINT="http://localhost:8088/openid/authorize"
-    OIDC_OP_TOKEN_ENDPOINT="http://localhost:8088/openid/token"
-    OIDC_OP_USER_ENDPOINT="http://localhost:8088/openid/userinfo"
+    OIDC_RP_CLIENT_ID = os.environ.get('OIDC_RP_CLIENT_ID', '1')  # Secret, do not put real credentials on Git
+    OIDC_RP_CLIENT_SECRET = os.environ.get('OIDC_RP_CLIENT_SECRET',
+                                           'secret')  # Secret, do not put real credentials on Git
+    OIDC_ENDPOINT_HOST = os.environ.get('OIDC_ENDPOINT_HOST', 'tmss_test_oidc')
+    OIDC_OP_AUTHORIZATION_ENDPOINT = "http://%s:8088/openid/authorize" % OIDC_ENDPOINT_HOST
+    OIDC_OP_TOKEN_ENDPOINT = "http://%s:8088/openid/token" % OIDC_ENDPOINT_HOST
+    OIDC_OP_USER_ENDPOINT = "http://%s:8088/openid/userinfo" % OIDC_ENDPOINT_HOST
 
     AUTHENTICATION_BACKENDS = ('mozilla_django_oidc.auth.OIDCAuthenticationBackend',)
 elif "TMSS_LDAPCREDENTIALS" in os.environ.keys():