summaryrefslogtreecommitdiff
path: root/contrib/podmanimage/upstream/Dockerfile
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2020-02-29 18:20:49 -0500
committerTomSweeneyRedHat <tsweeney@redhat.com>2020-03-05 09:15:58 -0500
commit6ad35e848d72943f55e9aa02f168ff1ccf5edf7e (patch)
treeaee9801ee163e6759392a5777d1f0592dcfc35ef /contrib/podmanimage/upstream/Dockerfile
parent9ffc525da70ba497f38df04dd6d3670170200071 (diff)
downloadpodman-6ad35e848d72943f55e9aa02f168ff1ccf5edf7e.tar.gz
podman-6ad35e848d72943f55e9aa02f168ff1ccf5edf7e.tar.bz2
podman-6ad35e848d72943f55e9aa02f168ff1ccf5edf7e.zip
Fix upstream dockerfile and add 'by hand' ctrfile
The podmanimage/upstream/Dockerfile had two rpms in its build procedure that are no longer available. The atomic-registries has been removed and the md2man has been renamed. In addtion conmon was not being installed and I've added that. I've been using a Containerfile to build or rebuild a specific version of the podmanimage stored in the stable repository with a version tag. As the other Containerfiles have been updated by others, and in case anyone else needs to build it, I've added it to the repo and have also updated the readme.md. FWIW, the builds in the quay.io/podman/upstream have been failing for a while due to missing rpms. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Diffstat (limited to 'contrib/podmanimage/upstream/Dockerfile')
-rw-r--r--contrib/podmanimage/upstream/Dockerfile4
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 \