From dbc8a210855b1b3dce2b3f6d69abcbc3977137a0 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Wed, 17 Jun 2026 11:25:17 +0200 Subject: [PATCH] Bump alpine base image Also adjusts the build image to use the opencloudeu/golang image. So we're in sync with how the binaries are built in CI. It already contains all the required dependencies. --- Dockerfile | 5 ++--- opencloud/docker/Dockerfile.multiarch | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a0b95a7f17..10c9211c8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,15 +21,14 @@ COPY ./ /opencloud/ WORKDIR /opencloud/opencloud RUN make node-generate-prod -FROM golang:1.24-alpine AS build -RUN apk add bash make git curl gcc musl-dev libc-dev binutils-gold inotify-tools vips-dev +FROM quay.io/opencloudeu/golang-ci:1.25 AS build COPY --from=generate /opencloud /opencloud WORKDIR /opencloud/opencloud RUN make go-generate build ENABLE_VIPS=true -FROM alpine:3.23 +FROM alpine:3.24 RUN apk add --no-cache attr ca-certificates curl mailcap tree vips && \ echo 'hosts: files dns' >| /etc/nsswitch.conf diff --git a/opencloud/docker/Dockerfile.multiarch b/opencloud/docker/Dockerfile.multiarch index 8872bbbf46..47a7f9e31c 100644 --- a/opencloud/docker/Dockerfile.multiarch +++ b/opencloud/docker/Dockerfile.multiarch @@ -1,4 +1,4 @@ -FROM golang:alpine3.23 AS build +FROM quay.io/opencloudeu/golang-ci:1.25 AS build ARG TARGETOS ARG TARGETARCH ARG VERSION @@ -6,8 +6,6 @@ ARG STRING ARG EDITION="dev" ARG SRCDIR -RUN apk add bash make git curl gcc musl-dev libc-dev binutils-gold inotify-tools vips-dev - WORKDIR /build RUN --mount=type=bind,target=/build,rw \ --mount=type=cache,target=/go/pkg/mod \ @@ -15,7 +13,7 @@ RUN --mount=type=bind,target=/build,rw \ GOOS="${TARGETOS:-linux}" GOARCH="${TARGETARCH:-amd64}" ; \ make -C ${SRCDIR:-.}/opencloud release-linux-docker-${TARGETARCH} ENABLE_VIPS=true DIST=/dist -FROM alpine:3.23 +FROM alpine:3.24 ARG VERSION ARG REVISION ARG TARGETOS