[19.03 backport] changes from master (step 2) #467
Merged
Conversation
This file contains 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
All images used are multi-arch now, so no need to parameterize Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 06ff3c2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ad03155) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
We were not currently using these to override, so may as well remove them. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a6a8d77) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
End of life as of 2019-05-28: https://fedoramagazine.org/fedora-28-end-of-life/ Signed-off-by: Andrew Hsu <andrewhsu@docker.com> (cherry picked from commit 235feec) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com> (cherry picked from commit ec3b30b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Arko Dasgupta <arko.dasgupta@docker.com> (cherry picked from commit 8b4a45a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
- Enable PowerTools repo - Disable building btrfs, which is no longer supported on CentOS/RHEL Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a03dda0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This repository is only specified in the aarch64 (arm64) images,
and therefore was not caught in CI.
Bringing back the fix that was previously there, to prevent failures:
docker#9 [stage-1 4/6] RUN yum-builddep -y /root/rpmbuild/SPECS/*.spec
docker#9 0.982 Loaded plugins: fastestmirror, ovl
docker#9 1.177 Enabling base-source repository
docker#9 1.177 Enabling extras-source repository
docker#9 1.178 Enabling updates-source repository
docker#9 1.179 Loading mirror speeds from cached hostfile
docker#9 1.181 * base: d36uatko69830t.cloudfront.net
docker#9 1.182 * extras: d36uatko69830t.cloudfront.net
docker#9 1.182 * updates: d36uatko69830t.cloudfront.net
docker#9 2.272 http://vault.centos.org/altarch/7/extras/Source/repodata/repomd.xml: [Errno 14] HTTP Error 404 - Not Found
docker#9 2.272 Trying other mirror.
docker#9 2.273 To address this issue please refer to the below wiki article
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 170199f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit b6331a2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com> (cherry picked from commit 6ea7ea0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4a90d5a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The release branches have moved back to the upstream docker/docker repository, so we should use that as source instead of the docker/engine fork (and rely on it being synced with upstream) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 30635cb) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
19.03_script_indents
branch
from
8c86e75
to
f526324
Compare
tiborvass
approved these changes
May 1, 2020
tiborvass
approved these changes
May 1, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is built on top of #464
cherry-picked some "safe" commits from #442 for a cleaner cherry-pick
Backports of