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

Fix docker issues #398

Merged
merged 4 commits into from
Jul 13, 2023
Merged

Fix docker issues #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bcfe839
added dependabot changes
oliveromahony Jul 12, 2023
c7456c5
missing deps
oliveromahony Jul 12, 2023
645cad8
fixing docker references in makefile
oliveromahony Jul 12, 2023
b3b0b26
Merge branch 'main' into fix-docker-issues
oliveromahony Jul 12, 2023
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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Dean-Coakley marked this conversation as resolved.
Show resolved Hide resolved
BASE_IMAGE = "${CONTAINER_REGISTRY}/${OS_RELEASE}:${OS_VERSION}"
IMAGE_TAG = "agent_${OS_RELEASE}_${OS_VERSION}"

Expand Down Expand Up @@ -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 .

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Expand Down
4 changes: 2 additions & 2 deletions scripts/docker/nginx-plus/ubuntu/Dockerfile
View file
Open in desktop
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why use cat instead of cp?

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down