Update path for NGINX cert and key

Author: lucacome

.github/workflows/ci.yml

@@ -36,21 +36,21 @@ jobs:
         uses: actions/checkout@v2
       - name: Fetch Certificates
         env:
-          CRT: ${{ secrets.NGINX_CRT }}
-          KEY: ${{ secrets.NGINX_KEY }}
+          CRT: ${{ secrets.KIC_NGINX_CRT }}
+          KEY: ${{ secrets.KIC_NGINX_KEY }}
         run: |
-          echo "${CRT}" | base64 --decode > docker/nginx-repo.crt
-          echo "${KEY}" | base64 --decode > docker/nginx-repo.key
+          echo "${CRT}" > docker/nginx-repo.crt
+          echo "${KEY}" > docker/nginx-repo.key
       - name: Build & Test Client
         if: (github.event_name != 'schedule')
         run: make test
       - name: Switch Repository (Nightly)
         if: (github.event_name == 'schedule')
         run: |
-          sed -i 's|plus-pkgs|pkgs-test|g' docker/Dockerfile
-          sed -i '20,31d' docker/Dockerfile
+          sed -i 's|pkgs.nginx.com|pkgs-test.nginx.com|g' docker/Dockerfile
+          sed -i '15d' docker/Dockerfile
           sed -i 's|deb https|deb [trusted=yes] https|g' docker/Dockerfile
-          sed -i 's|nginx-plus=\${NGINX_PLUS_VERSION}|nginx-plus|g' docker/Dockerfile
+          sed -i 's|nginx-plus-\${NGINX_PLUS_VERSION}|nginx-plus|g' docker/Dockerfile
       - name: Build & Test Client (Nightly)
         if: (github.event_name == 'schedule')
         run: make test

Makefile

@@ -21,7 +21,7 @@ lint:
 	$(GOLANGCI_CONTAINER) golangci-lint run
 
 docker-build:
-	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
+	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
 
 run-nginx-plus:
 	docker network create --driver bridge $(DOCKER_NETWORK)

docker/Dockerfile

@@ -7,6 +7,7 @@ ARG NGINX_PLUS_VERSION
 # Install NGINX Plus
 # Download certificate and key from the customer portal (https://my.f5.com)
 # and copy to the build context
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
     --mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
     apt-get update \