Skip to content

Commit 7e5efa8

Browse files
committed
Remove nap plus version override
1 parent 29c2e2c commit 7e5efa8

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
66
VERSION = $(GIT_TAG)-SNAPSHOT-$(GIT_COMMIT_SHORT)
77
TAG = $(VERSION:v%=%)
88
TARGET ?= local
9-
NAP_PLUS_VERSION ?= r24
109

1110
override DOCKER_BUILD_OPTIONS += --build-arg IC_VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg DATE=$(DATE)
1211
DOCKER_CMD = docker build $(DOCKER_BUILD_OPTIONS) --target $(TARGET) -f build/Dockerfile -t $(PREFIX):$(TAG) .
1312
PLUS_ARGS = --build-arg PLUS=-plus --build-arg FILES=plus-common --secret id=nginx-repo.crt,src=nginx-repo.crt --secret id=nginx-repo.key,src=nginx-repo.key
14-
NAP_ARGS = --build-arg FILES=nap-common --build-arg NGINX_PLUS_VERSION=$(NAP_PLUS_VERSION)
13+
NAP_ARGS = --build-arg FILES=nap-common
1514

1615
export DOCKER_BUILDKIT = 1
1716

0 commit comments

Comments
 (0)