Skip to content

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

Merged
AkihiroSuda merged 2 commits intomoby:masterfrom
thaJeztah:dockerfile_rewrite
Sep 27, 2021
Merged

Dockerfile: move installers into Dockerfile, and update registry versions#42881
AkihiroSuda merged 2 commits intomoby:masterfrom
thaJeztah:dockerfile_rewrite

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 24, 2021

Follow-up to #42674

  • Dockerfile: move installers into Dockerfile
    This moves installers that are only used during CI into the Dockerfile. Some installers are still used in the release-pipeline, so keeping thos for now.
  • Dockerfile: update test-registries to released versions
    • using v2.1.0 for the "v1" registry (last release with only v1)
    • using v2.3.0 as "current" version (was v2.3.0-rc.0)

Looks like various tests are failing on registry v2.7.1, so I'm keeping further updates for a follow-up to be looked into

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

This moves installers that are only used during CI into the Dockerfile. Some
installers are still used in the release-pipeline, so keeping thos for now.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added status/2-code-review area/testing kind/refactor PR's that refactor, or clean-up code labels Sep 24, 2021
@thaJeztah thaJeztah requested a review from tianon as a code owner September 24, 2021 14:59
- using v2.1.0 for the "v1" registry (last release with only v1)
- using v2.3.0 as "current" version (was v2.3.0-rc.0)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Copy link
Member

@tianon tianon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love the detailed comments 👌

@thaJeztah
Copy link
Member Author

Love the detailed comments 👌

Thanks! I took some of that from #40094, which was an old attempt to do something like this (some follow-ups are still needed to "punch through" all options to the build, but I need to have a closer look at some of those to take into account both the make binary and make shell -> hack/make.sh scenarios)

@thaJeztah
Copy link
Member Author

@AkihiroSuda @cpuguy83 PTAL

@AkihiroSuda AkihiroSuda merged commit 306fa44 into moby:master Sep 27, 2021
@thaJeztah thaJeztah deleted the dockerfile_rewrite branch September 27, 2021 11:54
@thaJeztah thaJeztah added this to the 21.xx milestone Oct 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/testing kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants