Skip to content

Commit 4badb0e

Browse files
committed
fix execution of commands in agent-devenv
Use `docker compose exec` instead of `docker exec` to make sure that Development Environment commands execute in the correct container, even when multiple Development Environment are running simultanously.
1 parent 597bad6 commit 4badb0e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -477,23 +477,23 @@ test-services-stop:
477477

478478
dev-shell:
479479
docker compose --profile dev up --build --remove-orphans -d
480-
docker exec -it agent-devenv bash -c "sh files/set_path.sh ; bash"
480+
docker compose exec -it devenv bash -c "sh files/set_path.sh ; bash"
481481

482482
dev-build:
483483
docker compose --profile dev up --build --remove-orphans -d
484-
docker exec -it agent-devenv bash -c "sh files/set_path.sh ; make -j4 all"
484+
docker compose exec -it devenv bash -c "sh files/set_path.sh ; make -j4 all"
485485

486486
dev-unit-tests:
487487
docker compose --profile dev up --build --remove-orphans -d
488-
docker exec -it agent-devenv bash -c "sh files/set_path.sh ; make -j4 valgrind"
488+
docker compose exec -it devenv bash -c "sh files/set_path.sh ; make -j4 valgrind"
489489

490490
dev-integration-tests:
491491
docker compose --profile dev up --build --remove-orphans -d
492-
docker exec -it agent-devenv bash -c "sh files/set_path.sh ; ./bin/integration_runner -agent ./agent/.libs/newrelic.so"
492+
docker compose exec -it devenv bash -c "sh files/set_path.sh ; ./bin/integration_runner -agent ./agent/.libs/newrelic.so"
493493

494494
dev-all:
495495
docker compose --profile dev up --build --remove-orphans -d
496-
docker exec -it agent-devenv bash -c "sh files/set_path.sh ; make -j4 all valgrind; ./bin/integration_runner -agent ./agent/.libs/newrelic.so"
496+
docker compose exec -it devenv bash -c "sh files/set_path.sh ; make -j4 all valgrind; ./bin/integration_runner -agent ./agent/.libs/newrelic.so"
497497

498498
dev-stop:
499499
docker compose --profile dev stop

0 commit comments

Comments
 (0)