diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-09 14:23:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 14:23:41 +0100 |
| commit | f57fdd038d431ebbd59e39b909cab7543b5d8f01 (patch) | |
| tree | d71f28b2640445920fe3d4b0f8e62695f546fc31 /contrib/podmanimage | |
| parent | 154b5ca85dc760e047f3f91a1a0a4fb64e918b2c (diff) | |
| parent | 77994c495753d31795e0888cefa959188f13c31c (diff) | |
| download | podman-f57fdd038d431ebbd59e39b909cab7543b5d8f01.tar.gz podman-f57fdd038d431ebbd59e39b909cab7543b5d8f01.tar.bz2 podman-f57fdd038d431ebbd59e39b909cab7543b5d8f01.zip | |
Merge pull request #4819 from TomSweeneyRedHat/dev/tsweeney/fixpodmanimage
Update podmanimage build process
Diffstat (limited to 'contrib/podmanimage')
| -rw-r--r-- | contrib/podmanimage/stable/Dockerfile | 4 | ||||
| -rw-r--r-- | contrib/podmanimage/testing/Dockerfile | 4 | ||||
| -rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/contrib/podmanimage/stable/Dockerfile b/contrib/podmanimage/stable/Dockerfile index 6b4eb2220..c0c07d9d2 100644 --- a/contrib/podmanimage/stable/Dockerfile +++ b/contrib/podmanimage/stable/Dockerfile @@ -9,9 +9,9 @@ FROM fedora:latest # Don't include container-selinux and remove -# directories used by dnf that are just taking +# directories used by yum that are just taking # up space. -RUN yum -y install podman fuse-overlayfs --exclude container-selinux; rm -rf /var/cache /var/log/dnf* /var/log/yum.* +RUN useradd build; yum -y update; yum -y reinstall shadow-utils; yum -y install podman fuse-overlayfs --exclude container-selinux; rm -rf /var/cache /var/log/dnf* /var/log/yum.* # Adjust storage.conf to enable Fuse storage. RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf diff --git a/contrib/podmanimage/testing/Dockerfile b/contrib/podmanimage/testing/Dockerfile index 4dffc8911..a8e7653f6 100644 --- a/contrib/podmanimage/testing/Dockerfile +++ b/contrib/podmanimage/testing/Dockerfile @@ -11,9 +11,9 @@ FROM fedora:latest # Don't include container-selinux and remove -# directories used by dnf that are just taking +# directories used by yum that are just taking # up space. -RUN yum -y install podman fuse-overlayfs --exclude container-selinux --enablerepo updates-testing; rm -rf /var/cache /var/log/dnf* /var/log/yum.* +RUN useradd build; yum -y update; yum -y reinstall shadow-utils; yum -y install podman fuse-overlayfs --exclude container-selinux --enablerepo updates-testing; rm -rf /var/cache /var/log/dnf* /var/log/yum.* # Adjust storage.conf to enable Fuse storage. RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile index 58e54b5b5..7c9434fa6 100644 --- a/contrib/podmanimage/upstream/Dockerfile +++ b/contrib/podmanimage/upstream/Dockerfile @@ -17,7 +17,7 @@ ENV GOPATH=/root/podman # to the container. # Finally remove the podman directory and a few other packages # that are needed for building but not running Podman -RUN dnf -y install --exclude container-selinux \ +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 \ @@ -63,8 +63,8 @@ RUN dnf -y install --exclude container-selinux \ # Adjust libpod.conf to write logging to a file sed -i 's/# events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf; \ rm -rf /root/podman/*; \ - dnf -y remove git golang go-md2man make; \ - dnf clean all; + yum -y remove git golang go-md2man make; \ + yum clean all; # Adjust storage.conf to enable Fuse storage. RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf |