From 312a59f9c28294a572aab81afade7ffdce273442 Mon Sep 17 00:00:00 2001 From: Colin Hutchinson Date: Mon, 29 Aug 2022 15:59:48 +0000 Subject: [PATCH] fix(enterprise): our Kong enterprise requires additional ports --- Makefile | 2 ++ test/build_container.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 9685aff0..a7f3625d 100644 --- a/Makefile +++ b/Makefile @@ -450,6 +450,7 @@ ifneq ($(RESTY_IMAGE_BASE),src) DOCKER_KONG_VERSION=$(DOCKER_KONG_VERSION) \ DOCKER_BUILD_PROGRESS=$(DOCKER_BUILD_PROGRESS) \ DOCKER_LABELS="$(DOCKER_LABELS)" \ + EDITION="$(EDITION)" \ test/build_container.sh docker tag $(DOCKER_RELEASE_REPOSITORY):amd64-$(KONG_TEST_CONTAINER_TAG) \ $(DOCKER_RELEASE_REPOSITORY):$(KONG_TEST_CONTAINER_TAG) @@ -467,6 +468,7 @@ ifeq ($(BUILDX),true) KONG_TEST_CONTAINER_TAG=$(KONG_TEST_CONTAINER_TAG) \ DOCKER_KONG_VERSION=$(DOCKER_KONG_VERSION) \ DOCKER_LABELS="$(DOCKER_LABELS)" \ + EDITION="$(EDITION)" \ test/build_container.sh endif endif diff --git a/test/build_container.sh b/test/build_container.sh index 7b2a88b7..1f21b1eb 100755 --- a/test/build_container.sh +++ b/test/build_container.sh @@ -51,6 +51,10 @@ pushd ./docker-kong DOCKER_BUILD_ARGS+=(--no-cache) DOCKER_BUILD_ARGS+=(--pull) DOCKER_BUILD_ARGS+=(--build-arg ASSET=local .) + + if [[ "$EDITION" == 'enterprise' ]]; then + DOCKER_BUILD_ARGS+=(--build-arg EE_PORTS="8002 8445 8003 8446 8004 8447") + fi docker build \ --progress=${DOCKER_BUILD_PROGRESS:-auto} \