From 4b2c08c125b4b9462a535aba7a46e0bc4deca5b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <1005065+DeepDiver1975@users.noreply.github.com> Date: Wed, 10 Jun 2026 23:41:55 +0200 Subject: [PATCH 1/2] chore: use multi-arch base image directly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit owncloud/ubuntu:20.04 and owncloud/ubuntu:22.04 are already multi-arch OCI image indices (amd64 + arm64). buildx resolves the correct platform layer automatically, so the multi-stage FROM workaround is unnecessary. Co-Authored-By: Claude Sonnet 4.6 Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com> --- v20/Dockerfile.multiarch | 6 +----- v22/Dockerfile.multiarch | 6 +----- v24/Dockerfile.multiarch | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/v20/Dockerfile.multiarch b/v20/Dockerfile.multiarch index 29eabb00..69b052c2 100644 --- a/v20/Dockerfile.multiarch +++ b/v20/Dockerfile.multiarch @@ -1,8 +1,4 @@ -FROM owncloud/ubuntu:20.04-amd64@sha256:de7decaa013d5933c855ed2475c36b3d5991a821e847da4be2ceeecb68f3093d AS base-amd64 -FROM owncloud/ubuntu:20.04-arm64v8@sha256:f2bf53708c8e5393371e106e621e8b458557da2bf7d056a79dc3b3a1ad98cb06 AS base-arm64 - -ARG TARGETARCH -FROM base-${TARGETARCH} +FROM owncloud/ubuntu:20.04 LABEL maintainer="ownCloud GmbH " \ org.opencontainers.image.title="ownCloud CI NodeJS" \ diff --git a/v22/Dockerfile.multiarch b/v22/Dockerfile.multiarch index f95e7ddf..64a875b1 100644 --- a/v22/Dockerfile.multiarch +++ b/v22/Dockerfile.multiarch @@ -1,8 +1,4 @@ -FROM owncloud/ubuntu:22.04-amd64@sha256:4c7cd5f9c40b28cd12ce780d7b34cb18ad4a6c7039bbb764d23edc8498ad2e6b AS base-amd64 -FROM owncloud/ubuntu:22.04-arm64v8@sha256:21fe74802e2a3ac9d73ba854c6551dbddeb6304c69b89150ae215b2ea7566930 AS base-arm64 - -ARG TARGETARCH -FROM base-${TARGETARCH} +FROM owncloud/ubuntu:22.04 LABEL maintainer="ownCloud GmbH " \ org.opencontainers.image.title="ownCloud CI NodeJS" \ diff --git a/v24/Dockerfile.multiarch b/v24/Dockerfile.multiarch index 04ff7aec..39f045b4 100644 --- a/v24/Dockerfile.multiarch +++ b/v24/Dockerfile.multiarch @@ -1,8 +1,4 @@ -FROM owncloud/ubuntu:22.04-amd64@sha256:4c7cd5f9c40b28cd12ce780d7b34cb18ad4a6c7039bbb764d23edc8498ad2e6b AS base-amd64 -FROM owncloud/ubuntu:22.04-arm64v8@sha256:21fe74802e2a3ac9d73ba854c6551dbddeb6304c69b89150ae215b2ea7566930 AS base-arm64 - -ARG TARGETARCH -FROM base-${TARGETARCH} +FROM owncloud/ubuntu:22.04 LABEL maintainer="ownCloud GmbH " \ org.opencontainers.image.title="ownCloud CI NodeJS" \ From d22abbc8b33f5fbc64355afe92805165a7a230e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <1005065+DeepDiver1975@users.noreply.github.com> Date: Wed, 10 Jun 2026 23:47:12 +0200 Subject: [PATCH 2/2] chore: pin owncloud/ubuntu base image digests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.6 Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com> --- v20/Dockerfile.multiarch | 2 +- v22/Dockerfile.multiarch | 2 +- v24/Dockerfile.multiarch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v20/Dockerfile.multiarch b/v20/Dockerfile.multiarch index 69b052c2..21d05931 100644 --- a/v20/Dockerfile.multiarch +++ b/v20/Dockerfile.multiarch @@ -1,4 +1,4 @@ -FROM owncloud/ubuntu:20.04 +FROM owncloud/ubuntu:20.04@sha256:ae5ffb91c7aaa60d4cd709227746e8027f4fb7ff684a0813ade8f3e7ded2a22e LABEL maintainer="ownCloud GmbH " \ org.opencontainers.image.title="ownCloud CI NodeJS" \ diff --git a/v22/Dockerfile.multiarch b/v22/Dockerfile.multiarch index 64a875b1..f17db557 100644 --- a/v22/Dockerfile.multiarch +++ b/v22/Dockerfile.multiarch @@ -1,4 +1,4 @@ -FROM owncloud/ubuntu:22.04 +FROM owncloud/ubuntu:22.04@sha256:872b791ab2d46d2ea6c8f3f52889fdd6846ff91c560379ec4ebd2985f56db9cc LABEL maintainer="ownCloud GmbH " \ org.opencontainers.image.title="ownCloud CI NodeJS" \ diff --git a/v24/Dockerfile.multiarch b/v24/Dockerfile.multiarch index 39f045b4..2e50be08 100644 --- a/v24/Dockerfile.multiarch +++ b/v24/Dockerfile.multiarch @@ -1,4 +1,4 @@ -FROM owncloud/ubuntu:22.04 +FROM owncloud/ubuntu:22.04@sha256:872b791ab2d46d2ea6c8f3f52889fdd6846ff91c560379ec4ebd2985f56db9cc LABEL maintainer="ownCloud GmbH " \ org.opencontainers.image.title="ownCloud CI NodeJS" \