mirror of
https://github.com/zokradonh/kopano-docker
synced 2025-06-06 23:46:24 +00:00
Fix builds (#384)
A recent change in Alpine broke the use of shellcheck for me and the general recommendation of the Alpine team is to not mix a release with their edge repo. Therefore this fix now copies shellcheck over from their own build instead of installing it from the Alpine repos. Signed-off-by: Felix Bartels <felix@host-consultants.de>
This commit is contained in:
parent
13dad903c9
commit
f2ad4c5ea7
@ -1,4 +1,5 @@
|
||||
FROM docker:18.09
|
||||
FROM koalaman/shellcheck-alpine:v0.7.1 as shellcheck
|
||||
FROM docker:19.03
|
||||
ENV \
|
||||
COMMANDER_VERSION=1.2.1 \
|
||||
COMPOSE_VERSION=1.19.0 \
|
||||
@ -15,8 +16,9 @@ LABEL maintainer=az@zok.xyz \
|
||||
org.label-schema.version=1.0.0 \
|
||||
org.label-schema.schema-version="1.0"
|
||||
|
||||
RUN apk add --no-cache bash curl coreutils git grep expect make nano npm jq py-pip && \
|
||||
apk add --no-cache shellcheck --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
|
||||
RUN apk add --no-cache bash curl coreutils git grep expect make nano npm jq py-pip
|
||||
#RUN apk add --no-cache shellcheck --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community
|
||||
COPY --from=shellcheck /bin/shellcheck /bin/shellcheck
|
||||
|
||||
RUN curl -fSL "https://github.com/genuinetools/reg/releases/download/v$REG_VERSION/reg-linux-amd64" -o "/usr/local/bin/reg" && \
|
||||
curl -fSL "https://github.com/hadolint/hadolint/releases/download/v$HADOLINT_VERSION/hadolint-$(uname -s)-$(uname -m)" -o /usr/local/bin/hadolint && \
|
||||
|
Loading…
x
Reference in New Issue
Block a user