Skip to content

Commit 8d7644b

Browse files
committed
fix(docker): govips requires imagemagick to load BMP files now
For details see: davidbyttow/govips@dd8aed8
1 parent 110483b commit 8d7644b

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

.make/go.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ debug-linux-docker-amd64: release-dirs
113113
GOARCH=amd64 \
114114
go build \
115115
-gcflags="all=-N -l" \
116-
-tags 'netgo $(TAGS)' \
116+
-tags 'netgo,$(TAGS)' \
117117
-buildmode=exe \
118118
-trimpath \
119119
-ldflags '-extldflags "-static" $(DEBUG_LDFLAGS) $(DOCKER_LDFLAGS)' \
@@ -125,7 +125,7 @@ debug-linux-docker-arm64: release-dirs
125125
GOARCH=arm64 \
126126
go build \
127127
-gcflags="all=-N -l" \
128-
-tags 'netgo $(TAGS)' \
128+
-tags 'netgo,$(TAGS)' \
129129
-buildmode=exe \
130130
-trimpath \
131131
-ldflags '-extldflags "-static" $(DEBUG_LDFLAGS) $(DOCKER_LDFLAGS)' \

opencloud/docker/Dockerfile.multiarch

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ ARG REVISION
2020
ARG TARGETOS
2121
ARG TARGETARCH
2222

23-
RUN apk add --no-cache attr bash ca-certificates curl inotify-tools libc6-compat mailcap tree vips patch && \
24-
echo 'hosts: files dns' >| /etc/nsswitch.conf
23+
RUN apk add --no-cache attr bash ca-certificates curl imagemagick \
24+
inotify-tools libc6-compat mailcap tree vips \
25+
vips-magick patch && \
26+
echo 'hosts: files dns' >| /etc/nsswitch.conf
2527

2628
LABEL maintainer="openCloud GmbH <devops@opencloud.eu>" \
2729
org.opencontainers.image.title="OpenCloud" \

0 commit comments

Comments
 (0)