From 8d7644b17faa3263c39368188400a8b54fe11c0a Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp Date: Thu, 5 Mar 2026 14:03:54 +0100 Subject: [PATCH] fix(docker): govips requires imagemagick to load BMP files now For details see: https://github.com/davidbyttow/govips/commit/dd8aed88c0d8a8963b1513f410657b5777df0fed --- .make/go.mk | 4 ++-- opencloud/docker/Dockerfile.multiarch | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.make/go.mk b/.make/go.mk index a0945177d8..a61cffc4d6 100644 --- a/.make/go.mk +++ b/.make/go.mk @@ -113,7 +113,7 @@ debug-linux-docker-amd64: release-dirs GOARCH=amd64 \ go build \ -gcflags="all=-N -l" \ - -tags 'netgo $(TAGS)' \ + -tags 'netgo,$(TAGS)' \ -buildmode=exe \ -trimpath \ -ldflags '-extldflags "-static" $(DEBUG_LDFLAGS) $(DOCKER_LDFLAGS)' \ @@ -125,7 +125,7 @@ debug-linux-docker-arm64: release-dirs GOARCH=arm64 \ go build \ -gcflags="all=-N -l" \ - -tags 'netgo $(TAGS)' \ + -tags 'netgo,$(TAGS)' \ -buildmode=exe \ -trimpath \ -ldflags '-extldflags "-static" $(DEBUG_LDFLAGS) $(DOCKER_LDFLAGS)' \ diff --git a/opencloud/docker/Dockerfile.multiarch b/opencloud/docker/Dockerfile.multiarch index 7fc4dec880..876181867e 100644 --- a/opencloud/docker/Dockerfile.multiarch +++ b/opencloud/docker/Dockerfile.multiarch @@ -20,8 +20,10 @@ ARG REVISION ARG TARGETOS ARG TARGETARCH -RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat mailcap tree vips patch && \ - echo 'hosts: files dns' >| /etc/nsswitch.conf +RUN apk add --no-cache attr bash ca-certificates curl imagemagick \ + inotify-tools libc6-compat mailcap tree vips \ + vips-magick patch && \ + echo 'hosts: files dns' >| /etc/nsswitch.conf LABEL maintainer="openCloud GmbH " \ org.opencontainers.image.title="OpenCloud" \