Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build docker with go 1.19 #1231

Merged
merged 2 commits into from
Oct 9, 2023
Merged

Build docker with go 1.19 #1231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe2a76c
app-emulation/docker*: build docker with Go 1.19
dongsupark May 24, 2023
254f77a
changelog: Add entry for Docker permission issue
jepio Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/bugfixes/2023-10-09-docker-go-1.19.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fixed a regression in Docker resulting in file permissions being dropped from exported container images. ([scripts#1231](https://github.com/flatcar/scripts/pull/1231))
2 changes: 1 addition & 1 deletion ...tainer/src/third_party/coreos-overlay/app-emulation/docker-cli/docker-cli-20.10.24.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ GIT_COMMIT=e78084afe5
EGO_PN="github.com/docker/cli"

COREOS_GO_PACKAGE="${EGO_PN}"
COREOS_GO_VERSION="go1.18"
COREOS_GO_VERSION="go1.19"
Copy link
Member

Choose a reason for hiding this comment

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

A fat comment here to always align this with the upstream build system would be nice

Copy link
Member

Choose a reason for hiding this comment

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

E.g. point to https://github.com/docker/cli/blob/master/Dockerfile#L4

Copy link
Member

Choose a reason for hiding this comment

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

and https://github.com/moby/moby/blob/master/Dockerfile#L3 etc.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'll add that to main


inherit bash-completion-r1 golang-vcs-snapshot coreos-go-depend

Expand Down
2 changes: 1 addition & 1 deletion ...tainer/src/third_party/coreos-overlay/app-emulation/docker-proxy/docker-proxy-9999.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=6
EGO_PN="github.com/docker/libnetwork"

COREOS_GO_PACKAGE="${EGO_PN}"
COREOS_GO_VERSION="go1.18"
COREOS_GO_VERSION="go1.19"
COREOS_GO_GO111MODULE="off"

if [[ ${PV} == *9999 ]]; then
Expand Down
2 changes: 1 addition & 1 deletion ...ntainer/src/third_party/coreos-overlay/app-emulation/docker-runc/docker-runc-1.1.7.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EAPI=6

GITHUB_URI="github.com/opencontainers/runc"
COREOS_GO_PACKAGE="${GITHUB_URI}"
COREOS_GO_VERSION="go1.18"
COREOS_GO_VERSION="go1.19"
# the commit of runc that docker uses.
# see https://github.com/docker/docker-ce/blob/v19.03.15/components/engine/hack/dockerfile/install/runc.installer#L4
COMMIT_ID="532d81d385677036958916d9aed5dd3431c5edb5"
Expand Down
2 changes: 1 addition & 1 deletion sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-20.10.24.ebuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
EAPI=7
EGO_PN=github.com/docker/docker
GIT_COMMIT=d6cbf44b8c
COREOS_GO_VERSION="go1.18"
COREOS_GO_VERSION="go1.19"
COREOS_GO_GO111MODULE="off"

inherit bash-completion-r1 linux-info systemd udev golang-vcs-snapshot
Expand Down
Loading