diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-28 10:50:10 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-28 10:50:10 +0100 |
commit | 17ad800905a9b113b959b272d281ea3fecbe1998 (patch) | |
tree | 8aa6d6c92a1a62fecdaea36dc441bc68dd7d40f2 /contrib/cirrus/packer/fedora_setup.sh | |
parent | debd6face323698340d1d709181d53c12fd4066d (diff) | |
parent | 559deb84e7eebc4177e4ac38ff8647c3b1757524 (diff) | |
download | podman-17ad800905a9b113b959b272d281ea3fecbe1998.tar.gz podman-17ad800905a9b113b959b272d281ea3fecbe1998.tar.bz2 podman-17ad800905a9b113b959b272d281ea3fecbe1998.zip |
Merge pull request #5368 from cevich/opensuse_ubuntu_packages
Opensuse openbuild ubuntu + buildah packages
Diffstat (limited to 'contrib/cirrus/packer/fedora_setup.sh')
-rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 20014e5f3..81a46b13f 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -26,7 +26,6 @@ else warn "NOT enabling updates-testing repository for image based on $PRIOR_FEDORA_BASE_IMAGE" fi -echo "Installing general build/test dependencies for Fedora '$OS_RELEASE_VER'" REMOVE_PACKAGES=() INSTALL_PACKAGES=(\ autoconf @@ -74,6 +73,7 @@ INSTALL_PACKAGES=(\ make msitools nmap-ncat + ostree-devel pandoc podman procps-ng @@ -86,11 +86,15 @@ INSTALL_PACKAGES=(\ python3-dateutil python3-psutil python3-pytoml + rsync + runc selinux-policy-devel skopeo + skopeo-containers slirp4netns unzip vim + wget which xz zip @@ -112,16 +116,23 @@ case "$OS_RELEASE_VER" in *) bad_os_id_ver ;; esac + +echo "Installing general build/test dependencies for Fedora '$OS_RELEASE_VER'" $BIGTO ooe.sh sudo dnf install -y ${INSTALL_PACKAGES[@]} +install_buildah_packages + [[ "${#REMOVE_PACKAGES[@]}" -eq "0" ]] || \ $LILTO ooe.sh sudo dnf erase -y ${REMOVE_PACKAGES[@]} -# Ensure there are no disruptive periodic services enabled by default in image -systemd_banish +echo "Enabling cgroup management from containers" +ooe.sh sudo setsebool container_manage_cgroup true ooe.sh sudo /tmp/libpod/hack/install_catatonit.sh +# Ensure there are no disruptive periodic services enabled by default in image +systemd_banish + rh_finalize echo "SUCCESS!" |