From 9c327555854903a64222048234fe2236576de05c Mon Sep 17 00:00:00 2001 From: oseoin Date: Tue, 9 Jul 2024 10:11:44 +0100 Subject: [PATCH 1/2] Update description for k8s version in single image regression (#5986) --- .github/workflows/single-image-regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/single-image-regression.yml b/.github/workflows/single-image-regression.yml index 493b1ffa25..1bc8443ac8 100644 --- a/.github/workflows/single-image-regression.yml +++ b/.github/workflows/single-image-regression.yml @@ -14,7 +14,7 @@ on: required: true k8s-version: type: string - description: "e.g. 1.30.0" + description: "k8s version to test with, e.g. 1.30.0" required: true type: type: string From 24b34b50ab59f94d8decb31742ab981823a198d4 Mon Sep 17 00:00:00 2001 From: nginx-bot <68849795+nginx-bot@users.noreply.github.com> Date: Tue, 9 Jul 2024 02:15:25 -0700 Subject: [PATCH 2/2] Docker image update d41d8cd9 (#5985) Update docker images d41d8cd9 Co-authored-by: oseoin --- build/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 28700c60dd..f84eafffb9 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -10,8 +10,8 @@ ARG WAF_VERSION=v4 ############################################# Base images containing libs for Opentracing and FIPS ############################################# -FROM ghcr.io/nginxinc/dependencies/nginx-ot:nginx-1.27.0@sha256:1cc0b215247a1d2ed5e1ca49cd2e4e84c302d4894921b36f305597c8cdeac4d5 AS opentracing-lib -FROM ghcr.io/nginxinc/dependencies/nginx-ot:nginx-1.27.0-alpine@sha256:a2c21b8d38e7566759bbf264904146fcae112019ab75d78280b0d4e34029f3a8 AS alpine-opentracing-lib +FROM ghcr.io/nginxinc/dependencies/nginx-ot:nginx-1.27.0@sha256:1a77df60fd641db9e6a9323c8a484f642eb0e276df06104b592ecfd515bc1aef AS opentracing-lib +FROM ghcr.io/nginxinc/dependencies/nginx-ot:nginx-1.27.0-alpine@sha256:8e582e8cac837ad71372fbe1d80ab4d9894fa9dd9d3ad61163ebe87403b6b9db AS alpine-opentracing-lib FROM ghcr.io/nginxinc/alpine-fips:0.1.0-alpine3.17@sha256:f00b3f266422feaaac7b733b46903bd19eb1cd1caa6991131576f5f767db76f8 AS alpine-fips-3.17 FROM ghcr.io/nginxinc/alpine-fips:0.2.0-alpine3.19@sha256:1744ae3a8e795daf771f3f7df33b83160981545abb1f1597338e2769d06aa1cc AS alpine-fips-3.19 FROM redhat/ubi9-minimal@sha256:a7d837b00520a32502ada85ae339e33510cdfdbc8d2ddf460cc838e12ec5fa5a AS ubi-minimal