Skip to content

Commit 4c3b348

Browse files
committed
Cleanup compose file uses
1 parent 7c08287 commit 4c3b348

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ Choose the appropriate docker, podman or podman-compose commands in the directio
9393
- `podman-compose --podman-build-args='--format docker' build`
9494
- 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.
9595
- Build Agent images
96-
- `docker compose -f agent-compose.yml build`
97-
- `podman compose -f agent-compose.yml build`
98-
- `podman-compose -f agent-compose.yml --podman-build-args='--format docker' build`
96+
- `docker compose -f testenv-compose.yml build`
97+
- `podman compose -f testenv-compose.yml build`
98+
- `podman-compose -f testenv-compose.yml --podman-build-args='--format docker' build`
9999
- Start System. Note: You may omit the `-d` argument to keep logs in the foreground.
100100
- `docker compose up -d`
101101
- `podman compose up -d`
102102
- Start additional ION Agent Nodes
103-
- `docker compose -f agent-compose.yml up -d`
104-
- `podman compose -f agent-compose.yml up -d`
103+
- `docker compose -f testenv-compose.yml up -d`
104+
- `podman compose -f testenv-compose.yml up -d`
105105

106106
### Alternative Build.sh setup script (deprecated, docker-only)
107107
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
188188
```
189189
from within the `anms/` folder.
190190

191-
To restart the agents forcefully, controlled with a different compose file `agent-compose.yml` run:
191+
To restart the agents forcefully, controlled with a different compose file `testenv-compose.yml` run:
192192
```sh
193-
docker-compose -f agent-compose.yml up -d --force-recreate
193+
docker-compose -f testenv-compose.yml up -d --force-recreate
194194
```
195195

196196
### Compose Environment and Options

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ then
102102
fi
103103

104104
echo "Running docker-compose up"
105-
ANMS_COMPOSE_OPTS="-f docker-compose.yml -p anms"
106-
AGENT_COMPOSE_OPTS="-f agent-compose.yml -p agents"
105+
ANMS_COMPOSE_OPTS="-f docker-compose.yml"
106+
AGENT_COMPOSE_OPTS="-f testenv-compose.yml"
107107
for OPTS_NAME in ANMS_COMPOSE_OPTS AGENT_COMPOSE_OPTS; do
108108
docker compose ${!OPTS_NAME} up --detach
109109
done

export.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
exit 1
1919
fi
2020

21-
IMAGES=$(${COMPOSE_CMD} -f docker-compose.yml -f agent-compose.yml config | grep --color=auto 'image:' | awk '{print $2}' | sort -u | less)
21+
IMAGES=$(${COMPOSE_CMD} -f docker-compose.yml -f testenv-compose.yml config | grep --color=auto 'image:' | awk '{print $2}' | sort -u | less)
2222
echo "${COMPOSE_CMD} reports the following images: ${IMAGES}"
2323

2424
# Determine base command (docker or podman)

puppet/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ bolt-debug.log
77
.rerun.json
88

99
# Files replaced by prep.sh
10-
modules/anms/files/docker-compose.yml
11-
modules/anms/files/agent-compose.yml
10+
modules/anms/files/*-compose.yml
1211
modules/anms/files/create_volume.sh
1312

1413
# Files replaced by apply_local.sh

testenv-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
# DOCKER_IMAGE_PREFIX to contain a (default empty) image registry and path to all custom images
2626
# DOCKER_IMAGE_TAG to contain the image tag for custom images
2727
#
28+
name: testenv
2829

2930
networks:
3031
# This network is created by docker-compose.yml

0 commit comments

Comments
 (0)