Skip to content

Refactor how the docker-compose / docker compose cmd is constructed #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kriscfoster merged 15 commits into from
Mar 6, 2026
Merged

Refactor how the docker-compose / docker compose cmd is constructed #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0c2ddbe
Fix docker inspect command for test container exit code
kriscfoster Mar 6, 2026
d66aefe
Improve exit code handling for Docker tests
kriscfoster Mar 6, 2026
259f7cb
Update assertion in HelloTest to check 'Helloo'
kriscfoster Mar 6, 2026
0c4197b
Update HelloTest.java
kriscfoster Mar 6, 2026
3e7a2a2
Update docker_compose_test.sh
kriscfoster Mar 6, 2026
9f91bcd
Update assertion in HelloTest to check 'Helloo'
kriscfoster Mar 6, 2026
add321a
Refactor exit code retrieval for test container
kriscfoster Mar 6, 2026
d3f2452
Fix docker inspect command syntax in test script
kriscfoster Mar 6, 2026
e6532b9
Update docker_compose_test.sh
kriscfoster Mar 6, 2026
61bf080
Simplify exit code retrieval for Docker container
kriscfoster Mar 6, 2026
d4fd1af
Update docker_compose_test.sh
kriscfoster Mar 6, 2026
9751aa2
Update docker_compose_test.sh
kriscfoster Mar 6, 2026
2011c48
Refactor docker compose command handling in script
kriscfoster Mar 6, 2026
b42943c
Update HelloTest.java
kriscfoster Mar 6, 2026
121feb6
Update MODULE.bazel
kriscfoster Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

module(
name = "rules_docker_compose_test",
version = "1.3.0",
version = "1.3.1",
)

bazel_dep(name = "rules_pkg", version = "1.0.1")
Expand Down
13 changes: 6 additions & 7 deletions docker_compose_test/docker_compose_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,14 @@ fi
# if we use the file from inside the sandbox, symlinks will be used for volume mounted files.
ABSOLUTE_COMPOSE_FILE_PATH=$WORKSPACE_PATH/$DOCKER_COMPOSE_FILE

docker_compose_bin="docker compose"
docker-compose --version &>/dev/null
if [ $? -eq 0 ]; then
docker_compose_bin="docker-compose"
docker_compose_bin=(docker compose)
if command -v docker-compose &>/dev/null; then
docker_compose_bin=(docker-compose)
fi

cleanup() {
echo "Cleaning up docker-compose resources..."
docker_compose_down_cmd="$docker_compose_bin -f $ABSOLUTE_COMPOSE_FILE_PATH down --volumes --remove-orphans"
docker_compose_down_cmd="${docker_compose_bin[@]} -f $ABSOLUTE_COMPOSE_FILE_PATH down --volumes --remove-orphans"
echo "running: $docker_compose_down_cmd"
echo "$docker_compose_down_cmd" | bash
}
Expand All @@ -66,13 +65,13 @@ cleanup() {
trap cleanup EXIT

# bring up compose file & get exit status-code from the integration test container.
docker_compose_up_cmd="$docker_compose_bin -f $ABSOLUTE_COMPOSE_FILE_PATH up --exit-code-from $DOCKER_COMPOSE_TEST_CONTAINER $EXTRA_DOCKER_COMPOSE_UP_ARGS"
docker_compose_up_cmd="${docker_compose_bin[@]} -f $ABSOLUTE_COMPOSE_FILE_PATH up --exit-code-from $DOCKER_COMPOSE_TEST_CONTAINER $EXTRA_DOCKER_COMPOSE_UP_ARGS"
echo "running: $docker_compose_up_cmd"
echo "$docker_compose_up_cmd" | bash
result=$?

# Figure out the exit code of the test container incase it never actually started.
EXIT_CODE=$(docker inspect $(docker compose -f $ABSOLUTE_COMPOSE_FILE_PATH ps -qa $DOCKER_COMPOSE_TEST_CONTAINER) --format='{{.State.ExitCode}}' 2>/dev/null)
EXIT_CODE=$(docker inspect $("${docker_compose_bin[@]}" -f $ABSOLUTE_COMPOSE_FILE_PATH ps -qa $DOCKER_COMPOSE_TEST_CONTAINER) --format='{{.State.ExitCode}}' 2>/dev/null)
if [ "$EXIT_CODE" != "0" ] || [ -z "$EXIT_CODE" ]; then
echo "Error: $DOCKER_COMPOSE_TEST_CONTAINER container failed or never started!"
exit 1
Expand Down