From c9bbf8b12110c578ff054083a9ea48f244bcf5b8 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Fri, 16 Feb 2024 09:41:48 +0000 Subject: [PATCH 1/2] bump nginx 1.25.4 sha256 --- build/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 1721ad1ddc..7e2c549007 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -25,7 +25,7 @@ RUN --mount=type=bind,from=alpine-opentracing-lib,target=/tmp/ot/ \ ############################################# Base image for Debian ############################################# -FROM nginx:1.25.4@sha256:4505e44646d175a819f80e172f4cf17cbc1404bc2908413175da943e2b8e460b AS debian +FROM nginx:1.25.4@sha256:c26ae7472d624ba1fafd296e73cecc4f93f853088e6a9c13c0d52f6ca5865107 AS debian RUN --mount=type=bind,from=opentracing-lib,target=/tmp/ot/ \ apt-get update \ From 864479c1d86162510e966abceb72a0e8cefb4196 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Fri, 16 Feb 2024 09:44:31 +0000 Subject: [PATCH 2/2] add s390x & arm/v7 oss platforms --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab7daf76e2..fd5185c3c6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -419,10 +419,10 @@ jobs: matrix: image: [debian, alpine] platforms: - ["linux/arm64, linux/amd64, linux/ppc64le"] + ["linux/arm", "linux/arm64, linux/amd64, linux/ppc64le", "linux/s390x"] include: - image: ubi - platforms: "linux/arm64, linux/amd64, linux/ppc64le" + platforms: "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x" uses: ./.github/workflows/build-oss.yml with: platforms: ${{ matrix.platforms }}