Merge pull request #6369 from rhatdan/build1

[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
2 changed files with 4 additions and 4 deletions

View File

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

View File

@ -1,4 +1,4 @@
FROM fedora:31
FROM fedora:32
ENV GOPATH="/var/tmp/go" \
GOBIN="/var/tmp/go/bin" \
@ -7,12 +7,13 @@ ENV GOPATH="/var/tmp/go" \
GOSRC="/var/tmp/go/src/github.com/containers/libpod"
# Only needed for installing build-time dependencies, then will be removed
COPY / $GOSRC
COPY . $GOSRC
# Install packages from dependencies.txt, ignoring commented lines
# Note: adding conmon and crun so podman command checks will work
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
# Install dependencies