69d2858460
When building the Dockerfiles for development, those images are mainly used to create a reproducible build-environment. The source code is bind-mounted into the image at runtime; there is no need to create an image with the actual source code, and copying the source code into the image would lead to a new image being created for each code-change (possibly leading up to many "dangling" images for previous code-changes). However, when building (and using) the development images in CI, bind-mounting is not an option, because the daemon is running remotely. To make this work, the circle-ci script patched the Dockerfiles when CI is run; adding a `COPY` to the respective Dockerfiles. Patching Dockerfiles is not really a "best practice" and, even though the source code does not and up in the image, the source would still be _sent_ to the daemon for each build (unless BuildKit is used). This patch updates the makefiles, circle-ci script, and Dockerfiles; - When building the Dockerfiles locally, pipe the Dockerfile through stdin. Doing so, prevents the build-context from being sent to the daemon. This speeds up the build, and doesn't fill up the Docker "temp" directory with content that's not used - Now that no content is sent, add the COPY instructions to the Dockerfiles, and remove the code in the circle-ci script to "live patch" the Dockerfiles. Before this patch is applied (with cache): ``` $ time make -f docker.Makefile build_shell_validate_image docker build -t docker-cli-shell-validate -f ./dockerfiles/Dockerfile.shellcheck . Sending build context to Docker daemon 41MB Step 1/2 : FROM debian:stretch-slim ... Successfully built 81e14e8ad856 Successfully tagged docker-cli-shell-validate:latest 2.75 real 0.45 user 0.56 sys ``` After this patch is applied (with cache):: ``` $ time make -f docker.Makefile build_shell_validate_image cat ./dockerfiles/Dockerfile.shellcheck | docker build -t docker-cli-shell-validate - Sending build context to Docker daemon 2.048kB Step 1/2 : FROM debian:stretch-slim ... Successfully built 81e14e8ad856 Successfully tagged docker-cli-shell-validate:latest 0.33 real 0.07 user 0.08 sys ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit166856ab1b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit:8997667aa2Component: cli
26 lines
838 B
Docker
26 lines
838 B
Docker
|
|
FROM golang:1.10.8-alpine
|
|
|
|
RUN apk add -U git make bash coreutils ca-certificates curl
|
|
|
|
ARG VNDR_SHA=1fc68ee0c852556a9ed53cbde16247033f104111
|
|
RUN go get -d github.com/LK4D4/vndr && \
|
|
cd /go/src/github.com/LK4D4/vndr && \
|
|
git checkout -q "$VNDR_SHA" && \
|
|
go build -v -o /usr/bin/vndr . && \
|
|
rm -rf /go/src/* /go/pkg/* /go/bin/*
|
|
|
|
ARG ESC_SHA=58d9cde84f237ecdd89bd7f61c2de2853f4c5c6e
|
|
RUN go get -d github.com/mjibson/esc && \
|
|
cd /go/src/github.com/mjibson/esc && \
|
|
git checkout -q "$ESC_SHA" && \
|
|
go build -v -o /usr/bin/esc . && \
|
|
rm -rf /go/src/* /go/pkg/* /go/bin/*
|
|
|
|
ENV CGO_ENABLED=0 \
|
|
PATH=$PATH:/go/src/github.com/docker/cli/build \
|
|
DISABLE_WARN_OUTSIDE_CONTAINER=1
|
|
WORKDIR /go/src/github.com/docker/cli
|
|
CMD sh
|
|
COPY . .
|