Skip to content

Commit 7634a77

Browse files
authored
Update path for NGINX cert and key (#72)
1 parent d3afe3b commit 7634a77

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
- name: Switch Repository (Nightly)
4848
if: (github.event_name == 'schedule')
4949
run: |
50-
sed -i 's|plus-pkgs|pkgs-test|g' docker/Dockerfile
51-
sed -i '20,31d' docker/Dockerfile
50+
sed -i 's|pkgs.nginx.com|pkgs-test.nginx.com|g' docker/Dockerfile
51+
sed -i '15d' docker/Dockerfile
5252
sed -i 's|deb https|deb [trusted=yes] https|g' docker/Dockerfile
53-
sed -i 's|nginx-plus=\${NGINX_PLUS_VERSION}|nginx-plus|g' docker/Dockerfile
53+
sed -i 's|nginx-plus-\${NGINX_PLUS_VERSION}|nginx-plus|g' docker/Dockerfile
5454
- name: Build & Test Client (Nightly)
5555
if: (github.event_name == 'schedule')
5656
run: make test

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ lint:
2121
$(GOLANGCI_CONTAINER) golangci-lint run
2222

2323
docker-build:
24-
docker build --secret id=nginx-repo.crt,src=nginx-repo.crt --secret id=nginx-repo.key,src=nginx-repo.key --build-arg NGINX_PLUS_VERSION=$(NGINX_PLUS_VERSION) -t $(NGINX_IMAGE) docker
24+
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_IMAGE) docker
2525

2626
run-nginx-plus:
2727
docker network create --driver bridge $(DOCKER_NETWORK)

docker/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ARG NGINX_PLUS_VERSION
77
# Install NGINX Plus
88
# Download certificate and key from the customer portal (https://my.f5.com)
99
# and copy to the build context
10+
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1011
RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
1112
--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
1213
apt-get update \

0 commit comments

Comments
 (0)