Fixing network configuration for docker

Author: DavidEdell

.github/workflows/build-test.yaml

@@ -72,7 +72,7 @@ jobs:
         run: |
           # Checkout the running gateway+backend
           podman build -t checkout-test checkout-test
-          podman run --network anms -v $PWD:/mnt -e XUNIT_OUTFILE=/mnt/testresults.xml -e CHECKOUT_BASE_URL=http://authnz:${AUTHNZ_PORT}/ -e SSL_CERT_FILE=/mnt/puppet/modules/apl_test/files/anms/tls/certs/ammos-ca-bundle.crt checkout-test
+          podman run --network anms -v $PWD:/mnt -e XUNIT_OUTFILE=/mnt/testresults.xml -e CHECKOUT_BASE_URL=http://authnz/ -e SSL_CERT_FILE=/mnt/puppet/modules/apl_test/files/anms/tls/certs/ammos-ca-bundle.crt checkout-test
       - name: Stop
         if: always()
         run: |

agent-compose.yml

@@ -25,7 +25,6 @@
 # DOCKER_IMAGE_PREFIX to contain a (default empty) image registry and path to all custom images
 # DOCKER_IMAGE_TAG to contain the image tag for custom images
 #
-version: '3.9'
 
 networks:
   # This network is created by docker-compose.yml
@@ -59,7 +58,6 @@ services:
     networks:
       default:
         ipv4_address: 10.5.0.102
-    command: "/sbin/init"
   ion-agent3:
     <<: *ion-agent
     hostname: ion-agent3

docker-compose.yml

@@ -28,18 +28,14 @@
 networks:
   default:
     name: ${DOCKER_CTR_PREFIX}anms
+    attachable: true
     driver_opts:
       com.docker.network.bridge.name: br-${DOCKER_CTR_PREFIX}anms
       com.docker.network.driver.mtu: 65535
     ipam:
       config:
         - subnet: 10.5.0.0/16
           gateway: 10.5.0.1
-          aux_addresses:
-            ion-manager: 10.5.0.101
-            ion-agent2: 10.5.0.102
-            ion-agent3: 10.5.0.103
-
 volumes:
   grafana-data: {}
   postgres-data: {}
@@ -366,6 +362,5 @@ services:
       DB_USER: ${DB_USER}
       DB_PASSWORD: ${DB_PASSWORD}
       DB_NAME: ${DB_NAME}
-    command: "/sbin/init"
-    # TODO: Above command is a workaround. Can likely be removed after fixing base.Dockerfile (done, but not rebuilt)
+