Skip to content

Commit e5a4468

Browse files
dependabot[bot]oliveromahony
authored andcommitted
Bump actions/dependency-review-action from 3.0.6 to 3.0.7 (#144)
Bumps [actions/dependency-review-action](https://github.com/actions/dependency-review-action) from 3.0.6 to 3.0.7. - [Release notes](https://github.com/actions/dependency-review-action/releases) - [Commits](actions/dependency-review-action@1360a34...7d90b4f) --- updated-dependencies: - dependency-name: actions/dependency-review-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent b447239 commit e5a4468

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
2323

2424
- name: "Dependency Review"
25-
uses: actions/dependency-review-action@1360a344ccb0ab6e9475edef90ad2f46bf8003b1 # v3.0.6
25+
uses: actions/dependency-review-action@7d90b4f05fea31dde1c4a1fb3fa787e197ea93ab # v3.0.7
2626
with:
2727
config-file: "nginxinc/k8s-common/dependency-review-config.yml@main"

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ DOCKER_NETWORK?=test
33
DOCKER_NETWORK_ALIAS=nginx-plus-test
44
DOCKER_NGINX_PLUS?=nginx-plus
55
DOCKER_NGINX_PLUS_HELPER?=nginx-plus-helper
6-
NGINX_REPO_URL?=pkgs-test.nginx.com
7-
NGINX_CERT_DIR?=docker
86

97
GOLANG_CONTAINER=golang:1.19
108

@@ -18,7 +16,7 @@ lint:
1816
docker run --pull always --rm -v $(shell pwd):/nginx-plus-go-client -w /nginx-plus-go-client -v $(shell go env GOCACHE):/cache/go -e GOCACHE=/cache/go -e GOLANGCI_LINT_CACHE=/cache/go -v $(shell go env GOPATH)/pkg:/go/pkg golangci/golangci-lint:latest golangci-lint --color always run
1917

2018
docker-build:
21-
docker build --secret id=nginx-repo.crt,src=${NGINX_CERT_DIR}/nginx-repo.crt --secret id=nginx-repo.key,src=${NGINX_CERT_DIR}/nginx-repo.key --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) --build-arg NGINX_REPO_URL=$(NGINX_REPO_URL) -t nginx-plus:$(NGINX_PLUS_VERSION) docker
19+
docker build --secret id=nginx-repo.crt,src=docker/nginx-repo.crt --secret id=nginx-repo.key,src=docker/nginx-repo.key --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) -t nginx-plus:$(NGINX_PLUS_VERSION) docker
2220

2321
run-nginx-plus:
2422
docker network create --driver bridge $(DOCKER_NETWORK)

docker/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
# syntax=docker/dockerfile:1.4
2-
FROM debian:bullseye
2+
FROM debian:bullseye-slim
33

44
LABEL maintainer="NGINX Docker Maintainers <integrations@nginx.com>"
55

66
ARG NGINX_PLUS_VERSION
7-
ARG NGINX_REPO_URL
87

98
# Install NGINX Plus
109
# Download certificate and key from the customer portal (https://my.f5.com)
@@ -17,7 +16,7 @@ RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode
1716
curl -fsSL https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nginx_signing.gpg
1817
curl -fsSL -o /etc/apt/apt.conf.d/90pkgs-nginx https://cs.nginx.com/static/files/90pkgs-nginx
1918
DEBIAN_VERSION=$(awk -F '=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release)
20-
printf "%s\n" "deb [trusted=yes] https://${NGINX_REPO_URL}/plus/${NGINX_PLUS_VERSION^^}/debian ${DEBIAN_VERSION} nginx-plus" > /etc/apt/sources.list.d/nginx-plus.list
19+
printf "%s\n" "deb https://pkgs.nginx.com/plus/${NGINX_PLUS_VERSION^^}/debian ${DEBIAN_VERSION} nginx-plus" > /etc/apt/sources.list.d/nginx-plus.list
2120
apt-get update
2221
apt-get install -y nginx-plus
2322
apt-get remove --purge --auto-remove -y gnupg

0 commit comments

Comments
 (0)