containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3192 from cevich/add_zip 

Cirrus: Add zip package to images
This commit is contained in:
OpenShift Merge Robot 2019-05-24 11:42:18 +02:00 committed by GitHub
parent 5296428e91 52c86775be
commit 1ac06d8469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cirrus.yml
View File

@ -31,9 +31,9 @@ env:
#### ####
#### Cache-image names to test with #### Cache-image names to test with
### ###
FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5170730531028992" FEDORA_CACHE_IMAGE_NAME: "fedora-29-libpod-5171433328607232"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5170730531028992" PRIOR_FEDORA_CACHE_IMAGE_NAME: "fedora-28-libpod-5171433328607232"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5170730531028992" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-18-libpod-5171433328607232"
#### ####
#### Variables for composing new cache-images (used in PR testing) from #### Variables for composing new cache-images (used in PR testing) from

3
contrib/cirrus/packer/fedora_setup.sh
View File

@ -66,7 +66,8 @@ ooe.sh sudo dnf install -y \
unzip \ unzip \
vim \ vim \
which \ which \
xz xz \
zip
install_varlink install_varlink

3
contrib/cirrus/packer/ubuntu_setup.sh
View File

@ -86,7 +86,8 @@ ooe.sh sudo -E apt-get -qq install \
socat \ socat \
unzip \ unzip \
vim \ vim \
xz-utils xz-utils \
zip
echo "Fixing Ubuntu kernel not enabling swap accounting by default" 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' SEDCMD='s/^GRUB_CMDLINE_LINUX="(.*)"/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1"/g'

5
contrib/gate/Dockerfile
View File

@ -31,11 +31,12 @@ RUN dnf -y install \
python3-pytoml \ python3-pytoml \
python3-pyyaml \ python3-pyyaml \
python3-varlink \ python3-varlink \
containers-common \
slirp4netns \
rsync \ rsync \
slirp4netns \
unzip \
which \ which \
xz \ xz \
zip \
&& dnf clean all && dnf clean all
ENV GOPATH="/go" \ ENV GOPATH="/go" \