Skip to content
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

Jump to bottom

Merge release to master #2093

Merged
merged 6 commits into from
Oct 14, 2021
Merged

Merge release to master #2093

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
706c9c1
Update JWT library to golang-jwt/jwt (#2074)
lucacome Oct 12, 2021
29c2e2c
Update packages for CVE-2021-37750
lucacome Oct 11, 2021
7e5efa8
Remove nap plus version override
ciarams87 Oct 12, 2021
681f97c
Use release specific repo for NAP on Debian (#2082)
lucacome Oct 13, 2021
bb8ec62
Release 2.0.2 (#2085)
ciarams87 Oct 13, 2021
75bca5f
Merge tag 'v2.0.2' into r-to-master
lucacome Oct 14, 2021
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
Prev Previous commit
Next Next commit
Remove nap plus version override
  • Loading branch information
@ciarams87
ciarams87 committed Oct 13, 2021
commit 7e5efa8b61451b692a27d616f9a77b87fc506317
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
VERSION = $(GIT_TAG)-SNAPSHOT-$(GIT_COMMIT_SHORT)
TAG = $(VERSION:v%=%)
TARGET ?= local
NAP_PLUS_VERSION ?= r24

override DOCKER_BUILD_OPTIONS += --build-arg IC_VERSION=$(VERSION) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg DATE=$(DATE)
DOCKER_CMD = docker build $(DOCKER_BUILD_OPTIONS) --target $(TARGET) -f build/Dockerfile -t $(PREFIX):$(TAG) .
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
NAP_ARGS = --build-arg FILES=nap-common --build-arg NGINX_PLUS_VERSION=$(NAP_PLUS_VERSION)
NAP_ARGS = --build-arg FILES=nap-common

export DOCKER_BUILDKIT = 1

Expand Down