diff options
| author | Chris Evich <cevich@redhat.com> | 2019-05-21 11:31:44 -0400 |
|---|---|---|
| committer | Chris Evich <cevich@redhat.com> | 2019-05-23 09:16:17 -0400 |
| commit | 361f787abe6fd44c5b58bcd3087fba7c7c6a46e1 (patch) | |
| tree | 0a3a61296040a94a79b9033d680295c52f689d43 | |
| parent | e0376b9c3f9af07d9e58a04a7cd58a7c065305e3 (diff) | |
| download | podman-361f787abe6fd44c5b58bcd3087fba7c7c6a46e1.tar.gz podman-361f787abe6fd44c5b58bcd3087fba7c7c6a46e1.tar.bz2 podman-361f787abe6fd44c5b58bcd3087fba7c7c6a46e1.zip | |
Cirrus: Add zip package to images
Signed-off-by: Chris Evich <cevich@redhat.com>
| -rw-r--r-- | contrib/cirrus/packer/fedora_setup.sh | 3 | ||||
| -rw-r--r-- | contrib/cirrus/packer/ubuntu_setup.sh | 3 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh index e031129d7..33e240895 100644 --- a/contrib/cirrus/packer/fedora_setup.sh +++ b/contrib/cirrus/packer/fedora_setup.sh @@ -66,7 +66,8 @@ ooe.sh sudo dnf install -y \ unzip \ vim \ which \ - xz + xz \ + zip install_varlink diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh index 56d7f962e..17e274d97 100644 --- a/contrib/cirrus/packer/ubuntu_setup.sh +++ b/contrib/cirrus/packer/ubuntu_setup.sh @@ -86,7 +86,8 @@ ooe.sh sudo -E apt-get -qq install \ socat \ unzip \ vim \ - xz-utils + xz-utils \ + zip echo "Fixing Ubuntu kernel not enabling swap accounting by default" SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g' diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile index e44c2fd4f..9a6f5dc8d 100644 --- a/contrib/gate/Dockerfile +++ b/contrib/gate/Dockerfile @@ -31,11 +31,12 @@ RUN dnf -y install \ python3-pytoml \ python3-pyyaml \ python3-varlink \ - containers-common \ - slirp4netns \ rsync \ + slirp4netns \ + unzip \ which \ xz \ + zip \ && dnf clean all ENV GOPATH="/go" \ |