build: Simpler Docker build #5057
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
alexec
commented
Feb 9, 2021
•
alexec
commented
| Build | Before | After |
|---|---|---|
| Docker Build | 1h | 45m |
| CI | 13m | 17m |
Signed-off-by: Alex Collins <alex_collins@intuit.com>
alexec
commented
Feb 9, 2021
| @@ -1,10 +1,21 @@ | |||
| # Prevent vendor directory from being copied to ensure we are not not pulling unexpected cruft from | |||
| # a user's workspace, and are only building off of what is locked by dep. | |||
| *.iml | |||
There was a problem hiding this comment.
while these files are small, they can result in invalidating the Docker caches, forcing build steps to be re-run
alexec
commented
Feb 9, 2021
|
|
||
| ARG IMAGE_OS=linux | ||
| ARG DOCKER_CHANNEL=stable |
There was a problem hiding this comment.
ARGs can and should go before the first FROM
alexec
commented
Feb 9, 2021
Dockerfile
Outdated
| tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ && \ | ||
| rm docker.tgz | ||
| # https://blog.container-solutions.com/faster-builds-in-docker-with-go-1-11 | ||
| WORKDIR /go/src/github.com/argoproj/argo |
There was a problem hiding this comment.
classic cache speed up technique
alexec
commented
Feb 9, 2021
| FROM debian:10.7-slim as argoexec-base | ||
|
|
||
| ARG IMAGE_OS=linux |
There was a problem hiding this comment.
we don't need this because we use `docker buildx --platform linux/amd64'
alexec
commented
Feb 9, 2021
|
|
||
| #################################################################################################### | ||
|
|
||
| FROM node:14.0.0 as argo-ui | ||
|
|
||
| ADD ["ui", "ui"] | ||
| ADD ["api", "api"] | ||
| COPY ui/package.json ui/yarn.lock ui/ |
There was a problem hiding this comment.
another classic speed up technique
alexec
commented
Feb 9, 2021
| COPY . . | ||
| # check we can use Git | ||
| RUN git rev-parse HEAD | ||
| RUN --mount=type=cache,target=/root/.cache/go-build make dist/workflow-controller |
There was a problem hiding this comment.
this is a buildx way to do build caching, I'm not 100% sure it works, so we may want to remove later on
alexec
commented
Feb 9, 2021
| COPY --from=argo-build --chown=8737 /go/src/github.com/argoproj/argo/argo-server.key argo-server.key | ||
| COPY --from=argo-build /go/src/github.com/argoproj/argo/dist/argo-${IMAGE_OS}-* /bin/argo | ||
|
|
||
| COPY hack/ssh_known_hosts /etc/ssh/ |
There was a problem hiding this comment.
no longer depend on argoexec
alexec
commented
Feb 9, 2021
| DOCKER_PUSH := false | ||
|
|
||
| # VERSION is the version to be used for files in manifests and should always be latest uunlesswe are releasing | ||
| # we assume HEAD means you are on a tag | ||
| ifeq ($(findstring release,$(GIT_BRANCH)),release) | ||
| VERSION := $(GIT_TAG) | ||
| DEV_IMAGE := false |
There was a problem hiding this comment.
no longer need dev images, standard build is fast enough
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
Signed-off-by: Alex Collins <alex_collins@intuit.com>
|
This is actually a 3m slower to run tests CI, but is faster to start-up locally. |
simster7
approved these changes
Feb 10, 2021
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.