diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 602e7cbd1aeb..8e2500f70413 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -26,6 +26,13 @@ RUN apk add --no-cache docker-cli docker-cli-buildx FROM alpine:3.17 as helm RUN apk add --no-cache helm +# Dependency: nsis (for building Windows installers) +FROM alpine:3.17 as nsis +RUN wget -nv https://nsis.sourceforge.io/mediawiki/images/4/4a/AccessControl.zip \ + && unzip AccessControl.zip -d /usr/share/nsis/ \ + && mkdir -p /usr/share/nsis/Plugins/x86-unicode \ + && cp /usr/share/nsis/Plugins/i386-unicode/AccessControl.dll /usr/share/nsis/Plugins/x86-unicode/ + # Dependency: Go and Go dependencies FROM ${GO_RUNTIME} as golang @@ -86,12 +93,13 @@ RUN apt-get update \ && gem install --no-document fpm \ && rm -rf /var/lib/apt/lists/* -COPY --from=golangci /bin/golangci-lint /usr/local/bin -COPY --from=docker /usr/bin/docker /usr/bin/docker -COPY --from=docker /usr/libexec/docker/cli-plugins /usr/libexec/docker/cli-plugins -COPY --from=helm /usr/bin/helm /usr/bin/helm -COPY --from=golang /usr/local/go /usr/local/go -COPY --from=golang /go/bin /go/bin +COPY --from=golangci /bin/golangci-lint /usr/local/bin +COPY --from=docker /usr/bin/docker /usr/bin/docker +COPY --from=docker /usr/libexec/docker/cli-plugins /usr/libexec/docker/cli-plugins +COPY --from=helm /usr/bin/helm /usr/bin/helm +COPY --from=nsis /usr/share/nsis/Plugins/x86-unicode /usr/share/nsis/Plugins/x86-unicode +COPY --from=golang /usr/local/go /usr/local/go +COPY --from=golang /go/bin /go/bin # Git tries to prevent misuse of repositories (CVE-2022-24765), but we don't # care about this for build containers, where it's expected that the repository