Skip to content

Commit 2d0d39e

Browse files
committed
Fix docker start & stop scripts
Prior to this change the `test` profile was not started by default. This is needed to run the chrome behat suite in EB, so we usually need this. Prior to this change, the `core/stop-dev-env.sh` would not bring down the test profile. This caused orphaned containers, which produced issues related to the docker network not being able to be removed, which prevented a clean startup of the `core` environment. Prior to this change, the docker compose `-v` flag was not able to be passed to the stop scripts, making it difficult to clean the slate.
1 parent 7e9d1e1 commit 2d0d39e

3 files changed

Lines changed: 7 additions & 6 deletions

File tree

core/start-dev-env.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ docker_compose_options=() # Array to hold the options for docker compose
3434
docker_compose_options+=("-f")
3535
docker_compose_options+=("${SCRIPT_DIR}/docker-compose.yml")
3636
docker_compose_options+=("--profile" "oidc")
37+
docker_compose_options+=("--profile" "test")
3738

3839
# Show help hint if no arguments are given
3940
if [ $# -eq 0 ]; then

core/stop-dev-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

3-
# Use docker compose to start the environment but with the modified override file(s)
3+
# Use docker compose to stop the environment.
44
echo -e "Stopping the dev environment with the following command:\n"
55

6-
command='docker compose --profile oidc --profile extras --profile invite --profile php --profile dashboard --profile sbs -f docker-compose.yml down'
6+
command="docker compose --profile oidc --profile test --profile extras --profile invite --profile php --profile dashboard --profile sbs -f docker-compose.yml down --remove-orphans $*"
77
echo "$command"
88
exec $command

stepup/stop-dev-env.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

3-
# Use docker compose to start the environment but with the modified override file(s)
4-
echo -e "Starting the dev environment with the following command:\n"
3+
# Use docker compose to stop the environment.
4+
echo -e "Stopping the dev environment with the following command:\n"
55

6-
echo -e "docker compose --profile smoketest -f docker-compose.yml down\n"
7-
docker compose --profile smoketest -f docker-compose.yml down
6+
echo -e "docker compose --profile smoketest -f docker-compose.yml down --remove-orphans $*\n"
7+
docker compose --profile smoketest -f docker-compose.yml down --remove-orphans $*

0 commit comments

Comments
 (0)