Dockerfile: simplify utility-install script, and update gotestsum to v1.7.0 by thaJeztah · Pull Request #42674 · moby/moby

thaJeztah · 2021-07-26T13:02:55Z

Dockerfile: use version for some utilities instead of commit-sha

The golangci-lint, gotestsum, shfmt, and vndr utilities should generally
be ok to be pinned by version instead of a specific sha. Also rename
the corresponding env-vars / build-args accordingly:

GOLANGCI_LINT_COMMIT -> GOLANGCI_LINT_VERSION
GOTESTSUM_COMMIT -> GOTESTSUM_VERSION
SHFMT_COMMIT -> SHFMT_VERSION
VNDR_COMMIT -> VNDR_VERSION
CONTAINERD_COMMIT -> CONTAINERD_VERSION
RUNC_COMMIT -> RUNC_VERSION
ROOTLESS_COMMIT -> ROOTLESS_VERSION

Dockerfile: use "go install" to install utilities

Dockerfile: remove GOPROXY override (was for go < 1.14)

Dockerfile: update gotestsum to v1.7.0

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

thaJeztah · 2021-08-18T22:21:55Z

hack/dockerfile/install/tomll.installer

Wondering if we should just remove these scripts now, and inline this in the Dockerfile. WDYT @cpuguy83 @tianon ?

^^ I started working on this, but it was slightly more involved, so I'll push those changes in a follow-up.

You mean inline just the extra tools (like tomll), or all the containerd, etc too? I'm +1 on the former but hesitant on the latter (since I think those scripts get used elsewhere too right?)

Yes, correct, the containerd and runc scripts are still used in some other places, so we likely still need those. For the "CI utilities", I think we should be able to put them inside the dockerfile; they're just one-liners now, so having two scripts to run them is just unneeded overhead.

thaJeztah · 2021-08-23T13:22:39Z

~~Moving to draft, as this now depends on #42776~~

merged

thaJeztah · 2021-08-27T17:38:14Z

hack/dockerfile/install/runc.installer

-
-	# Do not build with ambient capabilities support
-	RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp $RUNC_NOKMEM"}"
+	RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp"}"


I think we can also consider removing RUNC_BUILDTAGS now (assuming that make static does the right thing w.r.t. seccomp 🤔

thaJeztah · 2021-09-02T14:07:28Z

@tianon @cpuguy83 PTAL

tianon

Seems sane to me 👍

tianon · 2021-09-02T18:32:50Z

hack/dockerfile/install/tomll.installer

You mean inline just the extra tools (like tomll), or all the containerd, etc too? I'm +1 on the former but hesitant on the latter (since I think those scripts get used elsewhere too right?)

thaJeztah · 2021-09-02T18:36:36Z

hack/dockerfile/install/runc.installer

 	git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc"
-	cd "$GOPATH/src/github.com/opencontainers/runc"
-	git checkout -q "$RUNC_COMMIT"
+	cd "$GOPATH/src/github.com/opencontainers/runc" || true


changing this for -e instead

This build-tag was removed in opencontainers/runc@52390d6, which is part of runc v1.0.0-rc94 and up, so no longer relevant. the kmem options are now always disabled in runc. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

The golangci-lint, gotestsum, shfmt, and vndr utilities should generally be ok to be pinned by version instead of a specific sha. Also rename the corresponding env-vars / build-args accordingly: - GOLANGCI_LINT_COMMIT -> GOLANGCI_LINT_VERSION - GOTESTSUM_COMMIT -> GOTESTSUM_VERSION - SHFMT_COMMIT -> SHFMT_VERSION - VNDR_COMMIT -> VNDR_VERSION - CONTAINERD_COMMIT -> CONTAINERD_VERSION - RUNC_COMMIT -> RUNC_VERSION - ROOTLESS_COMMIT -> ROOTLESS_VERSION Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah · 2021-09-02T19:24:15Z

@tonistiigi updated; added set -e to the runc.installer

thaJeztah · 2021-09-06T08:40:07Z

hack/dockerfile/install/rootlesskit.installer

-	# TODO remove GOPROXY override once we updated to Go 1.14+
-	# Using goproxy instead of "direct" to work around an issue in go mod
-	# on Go 1.13 not working with older git versions (default version on
-	# CentOS 7 is git 1.8), see https://github.com/golang/go/issues/38373
-	export GOPROXY="https://proxy.golang.org"


Looks like this issue was not fixed in Go 1.14. go modules still doesn't work (without using the proxy) on CentOS 7 / older git versions; docker/docker-ce-packaging#553 (comment)

Dockerfile: simplify utility-install script, and update gotestsum to v1.7.0

thaJeztah added status/2-code-review area/testing labels Jul 26, 2021

thaJeztah force-pushed the bump_gotestsum branch 2 times, most recently from 776f040 to f40bb6b Compare July 27, 2021 22:09

thaJeztah marked this pull request as ready for review July 28, 2021 19:24

thaJeztah requested a review from tianon as a code owner July 28, 2021 19:24

thaJeztah force-pushed the bump_gotestsum branch from f40bb6b to 06cbbe8 Compare August 12, 2021 19:26

thaJeztah commented Aug 18, 2021

View reviewed changes

thaJeztah force-pushed the bump_gotestsum branch 2 times, most recently from c3c0da9 to bd22a9b Compare August 23, 2021 13:21

thaJeztah marked this pull request as draft August 23, 2021 13:22

thaJeztah force-pushed the bump_gotestsum branch from bd22a9b to 3761ef0 Compare August 27, 2021 17:28

thaJeztah marked this pull request as ready for review August 27, 2021 17:30

thaJeztah commented Aug 27, 2021

View reviewed changes

tianon approved these changes Sep 2, 2021

View reviewed changes

thaJeztah commented Sep 2, 2021

View reviewed changes

thaJeztah added 5 commits September 2, 2021 21:22

remove deprecated "nokmem" build-tag for runc

3c7c18a

This build-tag was removed in opencontainers/runc@52390d6, which is part of runc v1.0.0-rc94 and up, so no longer relevant. the kmem options are now always disabled in runc. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Dockerfile: remove GOPROXY override (was for go < 1.14)

3cec4b8

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Dockerfile: use "go install" to install utilities

14ff070

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Dockerfile: update gotestsum to v1.7.0

1b8db06

Signed-off-by: Sebastiaan van Stijn <[email protected]>

thaJeztah force-pushed the bump_gotestsum branch from 3761ef0 to 1b8db06 Compare September 2, 2021 19:23

tonistiigi approved these changes Sep 2, 2021

View reviewed changes

thaJeztah added status/4-merge and removed status/2-code-review labels Sep 2, 2021

thaJeztah merged commit 5176095 into moby:master Sep 2, 2021

thaJeztah deleted the bump_gotestsum branch September 2, 2021 21:24

thaJeztah mentioned this pull request Sep 6, 2021

Add workaround for CentOS 7 not working without GOPROXY docker/docker-ce-packaging#577

Merged

thaJeztah commented Sep 6, 2021

View reviewed changes

ngopher pushed a commit to ngopher/moby that referenced this pull request Sep 14, 2021

Merge pull request moby#42674 from thaJeztah/bump_gotestsum

cabe864

Dockerfile: simplify utility-install script, and update gotestsum to v1.7.0

thaJeztah mentioned this pull request Sep 24, 2021

Dockerfile: move installers into Dockerfile, and update registry versions #42881

Merged

thaJeztah added this to the 21.xx milestone Oct 15, 2021

This was referenced Jan 13, 2022

[20.10 backport] Add workaround for CentOS 7 not working without GOPROXY docker/docker-ce-packaging#619

Merged

[20.10 backport] update containerd binary v1.5.9, runc v1.0.3, and some script changes #43151

Merged

thaJeztah added the process/cherry-picked label Feb 18, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dockerfile: simplify utility-install script, and update gotestsum to v1.7.0#42674

Dockerfile: simplify utility-install script, and update gotestsum to v1.7.0#42674
thaJeztah merged 5 commits intomoby:masterfrom
thaJeztah:bump_gotestsum

thaJeztah commented Jul 26, 2021 •

edited

Loading

Uh oh!

thaJeztah Aug 18, 2021

Uh oh!

thaJeztah Aug 27, 2021

Uh oh!

tianon Sep 2, 2021

Uh oh!

thaJeztah Sep 2, 2021

Uh oh!

thaJeztah commented Aug 23, 2021 •

edited

Loading

Uh oh!

thaJeztah Aug 27, 2021

Uh oh!

thaJeztah commented Sep 2, 2021

Uh oh!

tianon left a comment

Uh oh!

tianon Sep 2, 2021

Uh oh!

thaJeztah Sep 2, 2021

Uh oh!

thaJeztah commented Sep 2, 2021

Uh oh!

thaJeztah Sep 6, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

thaJeztah commented Jul 26, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Dockerfile: use version for some utilities instead of commit-sha

Dockerfile: use "go install" to install utilities

Dockerfile: remove GOPROXY override (was for go < 1.14)

Dockerfile: update gotestsum to v1.7.0

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Aug 23, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Sep 2, 2021

Uh oh!

tianon left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Sep 2, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

thaJeztah commented Jul 26, 2021 •

edited

Loading

thaJeztah commented Aug 23, 2021 •

edited

Loading