summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/dependencies.txt1
-rw-r--r--contrib/gate/Dockerfile7
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/dependencies.txt b/contrib/dependencies.txt
index 5a6fa9834..f61912fde 100644
--- a/contrib/dependencies.txt
+++ b/contrib/dependencies.txt
@@ -2,7 +2,6 @@
btrfs-progs-devel
bzip2
-container-selinux
containernetworking-cni
device-mapper-devel
findutils
diff --git a/contrib/gate/Dockerfile b/contrib/gate/Dockerfile
index a6d927e2b..aa827c385 100644
--- a/contrib/gate/Dockerfile
+++ b/contrib/gate/Dockerfile
@@ -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