Skip to content

Commit 6c84dcb

Browse files
authored
fix: extract test mongo container ip correctly on the new docker versions. (#247)
1 parent 740ad9a commit 6c84dcb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docker/docker.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ docker-test-mongo-stop:
6262
.PHONY: docker-test
6363
docker-test: docker-test-image docker-test-mongo-run
6464
@docker run --rm \
65-
--env MONGO_HOST=$(shell docker inspect --format '{{ .NetworkSettings.IPAddress }}' $(MONGO_CONTAINER_NAME)) \
65+
--env MONGO_HOST=$(shell docker inspect --format '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(MONGO_CONTAINER_NAME)) \
6666
--volume $(PWD)/test:/usr/src/$(UTIL_NAME)/test \
6767
"$(TEST_DOCKER_TAG)" || (make docker-test-mongo-stop && exit 200)
6868
@make docker-test-mongo-stop
@@ -76,7 +76,7 @@ docker-autotest: docker-test-image docker-build-package docker-test-mongo-run
7676
docker run --rm \
7777
--volume $(PWD)/$(DEBIAN_PACKAGES_PATH):/usr/src/$(UTIL_NAME)/$(DEBIAN_PACKAGES_PATH) \
7878
--volume $(PWD)/test:/usr/src/$(UTIL_NAME)/test \
79-
--env MONGO_HOST=$(shell docker inspect --format '{{ .NetworkSettings.IPAddress }}' $(MONGO_CONTAINER_NAME)) \
79+
--env MONGO_HOST=$(shell docker inspect --format '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(MONGO_CONTAINER_NAME)) \
8080
--env-file .env \
8181
"$(TEST_DOCKER_TAG)" bash -c \
8282
"apt-get install -y /usr/src/${UTIL_NAME}/${DEBIAN_PACKAGES_PATH}/${DEB_PKG_NAME}.deb && make autotest"; \

0 commit comments

Comments
 (0)