Remove shellcheck from base

We should use this from a container at top level instead; it makes it
much harder to port to other architectures if we have to have this as
it is written in Haskell making a multi arch build much harder.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-07-11 22:15:27 +01:00
parent 4b3fc038b7
commit 30128d894e

View File

@ -38,9 +38,6 @@ RUN go get -u github.com/golang/lint/golint
RUN go get -u github.com/gordonklaus/ineffassign RUN go get -u github.com/gordonklaus/ineffassign
RUN go get -u github.com/LK4D4/vndr RUN go get -u github.com/LK4D4/vndr
FROM koalaman/shellcheck:v0.4.6@sha256:191b61e5f436fc51f22faaf2f4e0f77799f75977c7210377dd73a1a0f99ef8bd AS shellcheck
FROM alpine:3.6 FROM alpine:3.6
COPY --from=mirror /etc/apk/repositories /etc/apk/repositories COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
@ -50,9 +47,6 @@ COPY --from=mirror /go/bin /go/bin/
COPY --from=mirror /usr/share/ovmf/bios.bin /usr/share/ovmf/bios.bin COPY --from=mirror /usr/share/ovmf/bios.bin /usr/share/ovmf/bios.bin
COPY --from=mirror /Dockerfile /Dockerfile COPY --from=mirror /Dockerfile /Dockerfile
COPY --from=shellcheck /usr/local/bin/shellcheck /usr/local/bin/shellcheck
COPY --from=shellcheck /usr/local/lib/ /usr/local/lib/
RUN apk update && apk upgrade -a RUN apk update && apk upgrade -a
ENV CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90 ENV CONTAINERD_COMMIT=c215531a8f63a98a69134e804fea4ee6d354bb90