Packit: initial enablement #30
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,45 +5,45 @@ | |
| set -exo pipefail | ||
|
|
||
| ensure() { | ||
| if [[ ! -f "$1" ]]; then | ||
| echo "File not found:" "$1" | ||
| exit 1 | ||
| fi | ||
| if grep "^$2[[:blank:]].*=" "$1" > /dev/null | ||
| then | ||
| sed -i "s;^$2[[:blank:]]=.*;$2 = $3;" "$1" | ||
| else | ||
| if grep "^\#.*$2[[:blank:]].*=" "$1" > /dev/null | ||
| then | ||
| sed -i "/^#.*$2[[:blank:]].*=/a \ | ||
| $2 = $3" "$1" | ||
| else | ||
| echo "$2 = $3" >> "$1" | ||
| fi | ||
| fi | ||
| } | ||
|
|
||
| # Common options enabled across all fedora, centos, rhel | ||
| # TBD: Can these be enabled by default upstream? | ||
| ensure image/registries.conf short-name-mode \"enforcing\" | ||
|
|
||
| ensure storage/storage.conf driver \"overlay\" | ||
| ensure storage/storage.conf mountopt \"nodev,metacopy=on\" | ||
|
|
||
| ensure common/pkg/config/containers.conf runtime \"crun\" | ||
| ensure common/pkg/config/containers.conf log_driver \"journald\" | ||
|
Contributor
There was a problem hiding this comment. There was some … discussion in #4 about how packaging happens. Does this risk interfering with downstream RPMs?
Contributor
Author
There was a problem hiding this comment. This has been happening already in containers-common rpm that was done from the c/common repo and shipped to Fedora for quite sometime now. Only the path was updated to match monorepo. The final list of files installed is not being changed (after I remove the additional docs stuff that you commented about) |
||
|
|
||
| FEDORA=$(rpm --eval '%{?fedora}') | ||
| RHEL=$(rpm --eval '%{?rhel}') | ||
|
|
||
| # Set search registries | ||
| if [[ -n "$FEDORA" ]]; then | ||
| ensure image/registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"docker.io\"] | ||
| else | ||
| ensure image/registries.conf unqualified-search-registries [\"registry.access.redhat.com\",\ \"registry.redhat.io\",\ \"docker.io\"] | ||
| fi | ||
|
|
||
| # Set these on all Fedora and RHEL 10+ | ||
| if [[ -n "$FEDORA" ]] || [[ "$RHEL" -ge 10 ]]; then | ||
| sed -i -e '/^additionalimagestores\ =\ \[/a "\/usr\/lib\/containers\/storage",' storage/storage.conf | ||
| fi | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume that change is intentional?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, this one is intentional. We're not doing centos stream official updates via packit atm.