diff --git a/Dockerfile b/Dockerfile index 780b42b3d5..624f8870b2 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 e0e19a5889..df6ee68c4e 100644 --- a/opencloud/docker/Dockerfile.multiarch +++ b/opencloud/docker/Dockerfile.multiarch @@ -1,12 +1,10 @@ -FROM golang:alpine3.23 AS build +FROM quay.io/opencloudeu/golang-ci:1.25 AS build ARG TARGETOS ARG TARGETARCH ARG VERSION ARG STRING ARG EDITION -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 \ @@ -14,7 +12,7 @@ RUN --mount=type=bind,target=/build,rw \ GOOS="${TARGETOS:-linux}" GOARCH="${TARGETARCH:-amd64}" ; \ make -C opencloud/opencloud release-linux-docker-${TARGETARCH} ENABLE_VIPS=true DIST=/dist -FROM alpine:3.23 +FROM alpine:3.24 ARG VERSION ARG REVISION ARG TARGETOS