opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 21:07:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6369 from rhatdan/build1

Browse Source 
[CI:DOCS] Prepare image to turn on podman-commands test
This commit is contained in:
OpenShift Merge Robot
2020-05-24 06:34:39 -04:00
committed by GitHub
parent 56a95b0e7d ab0681380f
commit 7bfaf17059
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/dependencies.txt
View File

@ -2,7 +2,6 @@
btrfs-progs-devel btrfs-progs-devel
bzip2 bzip2
container-selinux
containernetworking-cni containernetworking-cni
device-mapper-devel device-mapper-devel
findutils findutils

7
contrib/gate/Dockerfile
View File

@ -1,4 +1,4 @@
FROM fedora:31 FROM fedora:32
ENV GOPATH="/var/tmp/go" \ ENV GOPATH="/var/tmp/go" \
GOBIN="/var/tmp/go/bin" \ GOBIN="/var/tmp/go/bin" \
@ -7,12 +7,13 @@ ENV GOPATH="/var/tmp/go" \
GOSRC="/var/tmp/go/src/github.com/containers/libpod" GOSRC="/var/tmp/go/src/github.com/containers/libpod"
# Only needed for installing build-time dependencies, then will be removed # Only needed for installing build-time dependencies, then will be removed
COPY / $GOSRC COPY . $GOSRC
# Install packages from dependencies.txt, ignoring commented lines # Install packages from dependencies.txt, ignoring commented lines
# Note: adding conmon and crun so podman command checks will work # Note: adding conmon and crun so podman command checks will work
RUN dnf -y install \ RUN dnf -y install \
$(grep "^[^#]" $GOSRC/contrib/dependencies.txt) conmon crun \ $(grep "^[^#]" $GOSRC/contrib/dependencies.txt) diffutils containers-common fuse-overlayfs conmon crun runc --exclude container-selinux \
sed -i -e 's|^#mount_program|mount_program|g' /etc/containers/storage.conf \
&& dnf clean all && dnf clean all
# Install dependencies # Install dependencies