Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.03] Fixes binary installation#454

Merged
andrewhsu merged 1 commit intodocker-archive:18.03from
seemethere:cherry_pick_packaging_88
Mar 6, 2018
Merged

[18.03] Fixes binary installation#454
andrewhsu merged 1 commit intodocker-archive:18.03from
seemethere:cherry_pick_packaging_88

Conversation

@seemethere
Copy link
Copy Markdown
Contributor

git cherry-pick -x -s -Xsubtree="components/packaging" 59164bedeab571029805a107e8e5a32fc9cd56b3

Cherry pick of docker/docker-ce-packaging#88

Cherry pick was clean

Original text:

Binary installation was broken after the
hack/dockerfile/install-binaries script was removed.

This remedies that.

Signed-off-by: Eli Uriegas eli.uriegas@docker.com
(cherry picked from commit 59164be)
Signed-off-by: Eli Uriegas eli.uriegas@docker.com

Binary installation was broken after the
hack/dockerfile/install-binaries script was removed.

This remedies that.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 59164be)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
@seemethere seemethere requested a review from a team March 6, 2018 21:52
@seemethere seemethere added this to the 18.03.0 milestone Mar 6, 2018
@seemethere seemethere changed the title Fixes binary installation [18.03] Fixes binary installation Mar 6, 2018
Copy link
Copy Markdown

@jose-bigio jose-bigio left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

this is needed because #450 was brought in which includes moby/moby#36449 which changes the way packages are built

@andrewhsu andrewhsu merged commit cbc5bef into docker-archive:18.03 Mar 6, 2018
@thaJeztah
Copy link
Copy Markdown
Member

Ah; offending PR was moby/moby#36336

Sorry, didn’t realize the packaging scripts relied on that

@seemethere seemethere deleted the cherry_pick_packaging_88 branch March 6, 2018 22:46
@seemethere
Copy link
Copy Markdown
Contributor Author

No worries @thaJeztah, luckily we had already fixed this in nightly builds so it was basically a non-issue

@tianon
Copy link
Copy Markdown
Contributor

tianon commented Mar 7, 2018

This needs to pass the static argument to all the *.installer scripts that were added in moby/moby#36336, doesn't it? (so that we don't end up with dynamic binaries, like we currently have in https://download.docker.com/linux/static/test/x86_64/docker-18.03.0-ce-rc2.tgz)

@seemethere
Copy link
Copy Markdown
Contributor Author

It's true, was an oversight. I'll get a PR up to fix that

@thaJeztah
Copy link
Copy Markdown
Member

❤️ thanks @tianon @seemethere

docker-jenkins pushed a commit that referenced this pull request Jan 23, 2020
[19.03 backport] Fix possible runtime panic in Lgetxattr
Upstream-commit: 69098f05cf0f61a1e8ff5f21075adc45288166dd
Component: engine
docker-jenkins pushed a commit that referenced this pull request Apr 21, 2020
…3.10

[19.03 backport] bump Golang 1.13.10
Upstream-commit: 7a9d665c0a9b2a0b84aa96757f69f51c04dfa045
Component: packaging
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants