diff options
| author | Chris Evich <cevich@redhat.com> | 2020-03-02 10:32:21 -0500 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2020-03-19 12:28:24 -0400 |
| commit | e810dd135ebe1bc732d411a2bcab574e06c41bb4 (patch) | |
| tree | d49a8adafaa891d53f29d9eee01502a58446ae93 /contrib/cirrus/packer/fedora_setup.sh | |
| parent | 4c9b0215332db9d068a61254936bd9fc54abf949 (diff) | |
| download | podman-e810dd135ebe1bc732d411a2bcab574e06c41bb4.tar.gz podman-e810dd135ebe1bc732d411a2bcab574e06c41bb4.tar.bz2 podman-e810dd135ebe1bc732d411a2bcab574e06c41bb4.zip | |
Cirrus: Include packages for buildah CI
Also, move some setup steps at VM image build time to save runtime.
Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'contrib/cirrus/packer/fedora_setup.sh')
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index 20014e5f3..cc7f1c34f 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,21 @@ 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[@]} [[ "${#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!" |