Cleanup configuration

docker-compose.yml

@@ -2,24 +2,23 @@ version: "3"
 
 networks:
   proxy-net:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.19.0.0/16
-          gateway: 172.19.0.1
 
 services:
 
   app:
     build:
       context: "./tests/containers/app"
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost"]
     networks:
       - proxy-net
 
   idp:
     image: jamedjo/test-saml-idp
     networks:
-      - proxy-net
+      proxy-net:
+        aliases:
+          - idp.example.edu
     ports:
       - "8080:8080"
       - "8443:8443"
@@ -39,7 +38,8 @@ services:
       - "443:443"
     networks:
       proxy-net:
-        ipv4_address: 172.19.0.10
+        aliases:
+          - sptest.example.edu
     depends_on:
       - app
       - idp
@@ -116,10 +116,10 @@ services:
         /oz8xKl5PKwOrvk2DH+FwaAg
         -----END PRIVATE KEY-----
       SAML_ENTITYID: https://sptest.example.edu/shibboleth
-      SAML_IDP_ENTITYID: http://idp:8080/simplesaml/saml2/idp/metadata.php
-      SAML_IDP_METADATA_URL: http://idp:8080/simplesaml/saml2/idp/metadata.php
+      SAML_IDP_ENTITYID: http://idp.example.edu:8080/simplesaml/saml2/idp/metadata.php
+      SAML_IDP_METADATA_URL: http://idp.example.edu:8080/simplesaml/saml2/idp/metadata.php
       SAML_IDP_METADATA: |
-        <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://idp:8080/simplesaml/saml2/idp/metadata.php">
+        <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://idp.example.edu:8080/simplesaml/saml2/idp/metadata.php">
           <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
             <md:KeyDescriptor use="signing">
               <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -135,9 +135,9 @@ services:
                 </ds:X509Data>
               </ds:KeyInfo>
             </md:KeyDescriptor>
-            <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://idp:8080/simplesaml/saml2/idp/SingleLogoutService.php"/>
+            <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://idp.example.edu:8080/simplesaml/saml2/idp/SingleLogoutService.php"/>
             <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-            <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://idp:8080/simplesaml/saml2/idp/SSOService.php"/>
+            <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://idp.example.edu:8080/simplesaml/saml2/idp/SSOService.php"/>
           </md:IDPSSODescriptor>
         </md:EntityDescriptor>
       SAML_SIGNING_CERT: |
@@ -262,20 +262,22 @@ services:
 
   selenium-firefox:
     image: selenium/standalone-firefox:120.0-20231122
+    depends_on:
+      - app
+      - idp
+      - proxy
     networks:
       - proxy-net
     ports:
       - "4444:4444"
       - "7900:7900"
-    extra_hosts:
-      - "sptest.example.edu:172.19.0.10"
     shm_size: "2g"
     environment:
       SE_OPTS: "--log-level SEVERE"
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost:4444/wd/hub/status"]
 
-  test-auth-firefox:
+  test:
     build:
       context: "./tests/containers/test"
     networks:
@@ -286,15 +288,9 @@ services:
         condition: service_healthy
       proxy:
         condition: service_healthy
-      # app:
-      #   condition: service_healthy
+      app:
+        condition: service_healthy
       idp:
         condition: service_healthy
     volumes:
       - "./tests/containers/test:/selenium"
-
-  # test:
-  #   build:
-  #     context: "./tests/containers/test"
-  #   networks:
-  #     - proxy-net