From 3f17c2c88b0be6ab3d8269a79d0d3a61c3bb929e Mon Sep 17 00:00:00 2001
From: Oliver O'Mahony <oliveromahony+github@gmail.com>
Date: Thu, 13 Jul 2023 11:32:19 +0100
Subject: [PATCH] Fix docker issues (#398)

* fixing docker references in makefile
---
 Makefile                                    | 8 ++++----
 scripts/docker/nginx-plus/ubuntu/Dockerfile | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 995fbb3bb..d22313d37 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ DATE = $(shell date +%F_%H-%M-%S)
 # | suse             | sles12sp5, sle15              |                                                                |
 # | freebsd          |                               | Not supported                                                  |
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-OS_RELEASE  ?= debian
-OS_VERSION  ?= bullseye-slim
+OS_RELEASE  ?= ubuntu
+OS_VERSION  ?= 22.04
 BASE_IMAGE  = "${CONTAINER_REGISTRY}/${OS_RELEASE}:${OS_VERSION}"
 IMAGE_TAG   = "agent_${OS_RELEASE}_${OS_VERSION}"
 
@@ -218,8 +218,8 @@ test-bench: ## Run benchmark tests
 
 benchmark-image: ## Build benchmark test container image for NGINX Plus, need nginx-repo.crt and nginx-repo.key in build directory
 	$(CONTAINER_BUILDENV) $(CONTAINER_CLITOOL) build --no-cache -t nginx-agent-benchmark:1.0.0 \
-		--secret id=nginx-crt,src=build/nginx-repo.crt \
-		--secret id=nginx-key,src=build/nginx-repo.key \
+		--secret id=nginx-crt,src=${CERTS_DIR}/nginx-repo.crt \
+		--secret id=nginx-key,src=${CERTS_DIR}/nginx-repo.key \
 		-f test/docker/Dockerfile .
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
diff --git a/scripts/docker/nginx-plus/ubuntu/Dockerfile b/scripts/docker/nginx-plus/ubuntu/Dockerfile
index d135fe9b5..65a641708 100644
--- a/scripts/docker/nginx-plus/ubuntu/Dockerfile
+++ b/scripts/docker/nginx-plus/ubuntu/Dockerfile
@@ -48,8 +48,8 @@ RUN --mount=type=secret,id=nginx-crt,dst=/nginx-repo.crt \
     && printf "deb https://$PACKAGES_REPO/plus/ubuntu/ `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nginx-plus.list \
     && printf "deb https://$PACKAGES_REPO/nginx-agent/ubuntu/ `lsb_release -cs` nginx-plus\n" > /etc/apt/sources.list.d/nginx-agent.list \
     && mkdir -p /etc/ssl/nginx \
-    && cp /nginx-repo.crt /etc/ssl/nginx/nginx-repo.crt \
-    && cp /nginx-repo.key /etc/ssl/nginx/nginx-repo.key \
+    && cat /nginx-repo.crt >> /etc/ssl/nginx/nginx-repo.crt \
+    && cat /nginx-repo.key >> /etc/ssl/nginx/nginx-repo.key \
     && apt-get update \
     && apt-get install $nginxPackages -y  \
     && rm /etc/ssl/nginx/nginx-repo.crt /etc/ssl/nginx/nginx-repo.key