Move package versions to ARGs in Dockerfile#40094
Closed
thaJeztah wants to merge 5 commits intomoby:masterfrom
Closed
Move package versions to ARGs in Dockerfile#40094thaJeztah wants to merge 5 commits intomoby:masterfrom
thaJeztah wants to merge 5 commits intomoby:masterfrom
Conversation
5aef008 to
ae10676
Compare
thaJeztah
commented
Oct 19, 2019
Member
Author
There was a problem hiding this comment.
Note; we likely need a make target, or alternative script, because I just discovered that the Docker packaging scripts rely on these; https://github.com/docker/docker-ce-packaging/blob/09b3ac8/deb/common/rules#L12-L15
override_dh_auto_build:
# Build the daemon and dependencies
cd engine && PRODUCT=docker ./hack/make.sh dynbinary
cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh tini
cd engine && TMP_GOPATH="/go" hack/dockerfile/install/install.sh proxy dynamic
# Build the CLI
kolyshkin
reviewed
Nov 10, 2019
Contributor
There was a problem hiding this comment.
There's no need to have this || return, since we do set -e in hack/dockerfile/install/install.sh.
Same in other places.
Member
Author
There was a problem hiding this comment.
Ah, right; so my linter highlights it, because (obviously) it doesn't know it's being sourced by that file. Perhaps better to repeat the set -e in this file, for situations where it's not called through install.sh but directly
kolyshkin
reviewed
Nov 10, 2019
Contributor
|
Left a few comments.
|
ae10676 to
103538c
Compare
103538c to
225ba59
Compare
98276a3 to
04f622e
Compare
Contributor
|
This change is great! Any update on this? |
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
cb3dc2b to
c2884a7
Compare
This makes the Dockerfile the cannonical location to specify which version of the dependencies to build. Also fix some linting issues in the install scripts Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Look for environment variables to override versions in the Dockerfile. This allows, for example: ``` DOCKERCLI_VERSION=19.03.5 \ CONTAINERD_COMMIT=0a1f2b40642e54ed06cd0a22cdf6025cbe70853c \ RUNC_COMMIT=2b52db75279ca687e18156de86d845876e9ef35d \ make shell ``` or ``` CONTAINERD_COMMIT=HEAD RUNC_COMMIT=HEAD make shell ``` or ``` CONTAINERD_COMMIT=master RUNC_COMMIT=master make shell ``` Which produces (inside the container) ``` containerd --version containerd github.com/containerd/containerd v1.3.0-251-g0a1f2b40 0a1f2b40642e54ed06cd0a22cdf6025cbe70853c runc --version runc version 1.0.0-rc9+dev commit: 2b52db75279ca687e18156de86d845876e9ef35d spec: 1.0.1-dev docker --version Docker version 19.03.5, build 633a0ea ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
c2884a7 to
eb0610b
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
built on top of #40362
This makes the Dockerfile the cannonical location to specify which version of the dependencies to build.