[pull] master from docker:master #61
Merged
+20
−11
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
The installation script's main purpose is to perform a fresh install, because
it's not guaranteed to work correctly when updating an existing installation,
and we print a warning if we find docker is already installed. However, it's
known that the script is used to update existing installations.
The current script has some limitations for the update scenario;
- When using the script for installing from the staging domain, the existing
repo configuration is not overwritten. When using `yum`, or older `dnf` versions
this resulted in 2 separate repo files to be created (docker-ce.repo and
docker-ce-staging.repo), which resulted in errors due to duplicate repo
definitions with the same name.
- When using `dnf5`, we specified the filename to store the configuration,
which resulted in an error;
+ sh -c 'dnf5 config-manager addrepo --save-filename=docker-ce.repo --from-repofile='\''https://download-stage.docker.com/linux/fedora/docker-ce-staging.repo'\'''
File "/etc/yum.repos.d/docker-ce.repo" already exists and configures repositories with IDs "docker-ce-stable docker-ce-stable-debuginfo docker-ce-stable-source docker-ce-test docker-ce-test-debuginfo docker-ce-test-source docker-ce-nightly docker-ce-nightly-debuginfo docker-ce-nightly-source". Add "--overwrite" to overwrite.
- On SLES, it would result in a similar error;
+ sh -c 'zypper addrepo https://download-stage.docker.com/linux/sles/docker-ce-staging.repo'
Adding repository 'Docker CE Nightly - s390x' ......................................................................................[error]
Repository named 'docker-ce-nightly' already exists. Please use another alias.
Adding repository 'Docker CE Nightly - Debuginfo s390x' ............................................................................[error]
Repository named 'docker-ce-nightly-debuginfo' already exists. Please use another alias.
This patch updates the script to overwrite / replace the existing repo config.
This brings the rpm-based installations in line with the Debian approach, which
unconditionally overwrites `/etc/apt/sources.list.d/docker.list`.
It's worth noting that this change will therefore overwrite any customisations
made to the repo-configurations, so a warning is added for that.
Signed-off-by: Sebastiaan van Stijn <[email protected]>
rpm: always replace existing repo-configuration
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.1)
Can you help keep this open source service alive? 💖 Please sponsor : )