diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-24 06:34:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-24 06:34:39 -0400 |
| commit | 7bfaf170599383a288c9b528a92922ad8aaf6c91 (patch) | |
| tree | 1397640d23800588560bef9f6a370d57d341f0ab | |
| parent | 56a95b0e7d1a9268873cf74e7746c3da48881f35 (diff) | |
| parent | ab0681380f4603049c87663aaf8d549725facbff (diff) | |
| download | podman-7bfaf170599383a288c9b528a92922ad8aaf6c91.tar.gz podman-7bfaf170599383a288c9b528a92922ad8aaf6c91.tar.bz2 podman-7bfaf170599383a288c9b528a92922ad8aaf6c91.zip | |
Merge pull request #6369 from rhatdan/build1
[CI:DOCS] Prepare image to turn on podman-commands test
| -rw-r--r-- | contrib/dependencies.txt | 1 | ||||
| -rw-r--r-- | contrib/gate/Dockerfile | 7 |
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 |