Cleanup compose file uses

Author: BrianSipos

README.md

@@ -93,15 +93,15 @@ Choose the appropriate docker, podman or podman-compose commands in the directio
   - `podman-compose --podman-build-args='--format docker' build`
     - Note: The docker format argument here enables suppoort for HEALTHCHECK. If omitted, the system will run but will be unable to report the health of the system.  This flag does not appear necessary when using the no-dash version of compose.
 - Build Agent images
-  - `docker compose -f agent-compose.yml build`
-  - `podman compose -f agent-compose.yml build`
-  - `podman-compose -f agent-compose.yml --podman-build-args='--format docker' build`
+  - `docker compose -f testenv-compose.yml build`
+  - `podman compose -f testenv-compose.yml build`
+  - `podman-compose -f testenv-compose.yml --podman-build-args='--format docker' build`
 - Start System. Note: You may omit the `-d` argument to keep logs in the foreground.
   - `docker compose up -d`
   - `podman compose up -d`
 - Start additional ION Agent Nodes
-  - `docker compose -f agent-compose.yml up -d`
-  - `podman compose -f agent-compose.yml up -d`
+  - `docker compose -f testenv-compose.yml up -d`
+  - `podman compose -f testenv-compose.yml up -d`
 
 ### Alternative Build.sh setup script (deprecated, docker-only)
 The ANMS repository contains a build script which will build and run multiple Docker containers.
@@ -188,9 +188,9 @@ docker-compose -f docker-compose.yml up -d
 ```
 from within the `anms/` folder.
 
-To restart the agents forcefully, controlled with a different compose file `agent-compose.yml` run:
+To restart the agents forcefully, controlled with a different compose file `testenv-compose.yml` run:
 ```sh
-docker-compose -f agent-compose.yml up -d --force-recreate
+docker-compose -f testenv-compose.yml up -d --force-recreate
 ```
 
 ### Compose Environment and Options

build.sh

@@ -102,8 +102,8 @@ then
 fi
 
 echo "Running docker-compose up"
-ANMS_COMPOSE_OPTS="-f docker-compose.yml -p anms"
-AGENT_COMPOSE_OPTS="-f agent-compose.yml -p agents"
+ANMS_COMPOSE_OPTS="-f docker-compose.yml"
+AGENT_COMPOSE_OPTS="-f testenv-compose.yml"
 for OPTS_NAME in ANMS_COMPOSE_OPTS AGENT_COMPOSE_OPTS; do
     docker compose ${!OPTS_NAME} up --detach
 done

export.sh

@@ -18,7 +18,7 @@ else
     exit 1
 fi
 
-IMAGES=$(${COMPOSE_CMD} -f docker-compose.yml -f agent-compose.yml config | grep --color=auto 'image:' | awk '{print $2}' | sort -u | less)
+IMAGES=$(${COMPOSE_CMD} -f docker-compose.yml -f testenv-compose.yml config | grep --color=auto 'image:' | awk '{print $2}' | sort -u | less)
 echo "${COMPOSE_CMD} reports the following images: ${IMAGES}"
 
 # Determine base command (docker or podman)

puppet/.gitignore

@@ -7,8 +7,7 @@ bolt-debug.log
 .rerun.json
 
 # Files replaced by prep.sh
-modules/anms/files/docker-compose.yml
-modules/anms/files/agent-compose.yml
+modules/anms/files/*-compose.yml
 modules/anms/files/create_volume.sh
 
 # Files replaced by apply_local.sh

testenv-compose.yml

@@ -25,6 +25,7 @@
 # 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
 #
+name: testenv
 
 networks:
   # This network is created by docker-compose.yml