diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-07 14:14:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-07 14:14:13 +0100 |
| commit | 43bf4f6626cc25ab839d989c025771de4669f86b (patch) | |
| tree | ac0b90dd86a59db751e71743fb5683cc9b8fef9f /contrib/podmanimage/upstream/Dockerfile | |
| parent | b92a9090ed42cfad02a3d75b0b81e3aa87233fc8 (diff) | |
| parent | 6ad35e848d72943f55e9aa02f168ff1ccf5edf7e (diff) | |
| download | podman-43bf4f6626cc25ab839d989c025771de4669f86b.tar.gz podman-43bf4f6626cc25ab839d989c025771de4669f86b.tar.bz2 podman-43bf4f6626cc25ab839d989c025771de4669f86b.zip | |
Merge pull request #5359 from TomSweeneyRedHat/dev/tsweeney/fixquay
Fix upstream dockerfile and add 'by hand' ctrfile
Diffstat (limited to 'contrib/podmanimage/upstream/Dockerfile')
| -rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile index 7c9434fa6..847097920 100644 --- a/contrib/podmanimage/upstream/Dockerfile +++ b/contrib/podmanimage/upstream/Dockerfile @@ -19,16 +19,16 @@ ENV GOPATH=/root/podman # that are needed for building but not running Podman RUN useradd build; yum -y update; yum -y reinstall shadow-utils; yum -y install --exclude container-selinux \ --enablerepo=updates-testing \ - atomic-registries \ btrfs-progs-devel \ containernetworking-cni \ + conmon \ device-mapper-devel \ git \ glib2-devel \ glibc-devel \ glibc-static \ go \ - golang-github-cpuguy83-go-md2man \ + golang-github-cpuguy83-md2man \ gpgme-devel \ iptables \ libassuan-devel \ |