From 75ab7c826d09ed835649cb5e180892e116049ea9 Mon Sep 17 00:00:00 2001 From: James Strong Date: Thu, 13 Oct 2022 10:47:16 -0400 Subject: [PATCH] testing Signed-off-by: James Strong --- distroless-build/Makefile | 4 ++-- distroless-build/melange/nginx-templates.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distroless-build/Makefile b/distroless-build/Makefile index ed3fedaac..080113b1d 100644 --- a/distroless-build/Makefile +++ b/distroless-build/Makefile @@ -30,7 +30,7 @@ MELANGE_DIR ?= melange APKO_DIR ?= apko MELANGE ?= docker run --rm --privileged -w /work -v "${PWD}":/work distroless.dev/melange:latest MELANGE_DETACHED ?= docker run -d -w /work --rm --privileged -v "${PWD}":/work distroless.dev/melange:latest -APKO ?= docker run --rm -w /work -v "${PWD}":/work ko.local:38f15a95ae791cd5deab7d054cb3c15129cedb25a2e30d0308a5f6c63c9865e3 +APKO ?= docker run --rm -w /work -v "${PWD}":/work ko.local:5f90a47e3144af5b529930d71eb58fc6ea0004113aa0cdb3d1da35d6065b594e KEY ?= melange.rsa REPO ?= packages TEMPLATE ?= melange/nginx-templates.json @@ -76,7 +76,7 @@ nginx-test: ## Start $IMAGE:$TAG container and drop into bash shell docker run --rm -it --entrypoint bash --env-file .env $(REGISTRY)/$(IMAGE):$(TAG) shell: ## Start Alpine base container, mount PWD and drop into sh - docker run -it --rm -v "${PWD}":/work --env-file .env --group-add www-data --entrypoint sh distroless.dev/alpine-base:latest + docker run -it --rm -v "${PWD}/..":/work --env-file .env --group-add www-data --entrypoint sh distroless.dev/alpine-base:latest check_clean: @echo -n "Are you sure? [y/N] " && read ans && [ $${ans:-N} = y ] diff --git a/distroless-build/melange/nginx-templates.json b/distroless-build/melange/nginx-templates.json index 4b9db0fb0..33387db8b 100644 --- a/distroless-build/melange/nginx-templates.json +++ b/distroless-build/melange/nginx-templates.json @@ -1,8 +1,8 @@ { "INGRESS_NGINX_VERSION": "debug", "PKG": "k8s.io/ingress-nginx", - "TAG": "main", - "COMMIT_SHA": "cee95b50a", + "TAG": "debug", + "COMMIT_SHA": "136e45be6", "REPO_INFO": "git@github.com:kubernetes/ingress-nginx.git", "NGINX_VERSION": "1.19.10", "NGINX_SHA": "e8d0290ff561986ad7cd6c33307e12e11b137186c4403a6a5ccdb4914c082d88",