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

Stop pre-installing podman utils/tools #240

Merged
merged 2 commits into from
Dec 14, 2022
Merged

Stop pre-installing podman utils/tools #240

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
5287c4c
Stop pre-installing podman utils/tools
cevich Dec 9, 2022
fbbff66
Temp. workaround missing criu-libs dep.
cevich Dec 13, 2022
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
7 changes: 7 additions & 0 deletions cache_images/fedora_packaging.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,13 @@ if [[ "$PACKER_BUILD_NAME" =~ prior ]]; then
EXARG="--exclude=netavark --exclude=aardvark-dns"
fi

# Workarond: Around the time of this commit, the `criu` package
# was found to be missing a recommends-dependency on criu-libs.
# Until a fixed rpm lands in the Fedora repositories, manually
# include it here. This workaround should be removed once the
# package is corrected (likely > 3.17.1-3).
INSTALL_PACKAGES+=(criu-libs)

# When installing during a container-build, having this present
# will seriously screw up future dnf operations in very non-obvious ways.
if ! ((CONTAINER)); then
Expand Down
11 changes: 0 additions & 11 deletions cache_images/podman_tooling.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,6 @@ export GOCACHE="${GOCACHE:-$GOPATH/cache}"
eval $(go env | tee /dev/stderr)
export PATH="$GOPATH/bin:$PATH"

echo "Installing runtime tooling"
lilto git clone --quiet https://github.com/containers/podman.git "$GOSRC"

cd "$GOSRC" || die "Podman repo. not cloned to expected directory: '$GOSRC'"
# Calling script already loaded lib.sh
lilto ./hack/install_catatonit.sh
bigto make install.tools

# shellcheck disable=SC2154
if [[ "$OS_RELEASE_ID" == "fedora" ]]; then
if [[ $(uname -m) == "x86_64" ]]; then
Expand All @@ -55,9 +47,6 @@ if [[ "$OS_RELEASE_ID" == "fedora" ]]; then
chmod +x /usr/local/bin/swagger
/usr/local/bin/swagger version
fi

# This is needed for rootless testing
make install.modules-load
fi

# Make pristine for other runtime usage/expectations also save a bit
Expand Down