containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4819 from TomSweeneyRedHat/dev/tsweeney/fixpodmanimage 

Update podmanimage build process
This commit is contained in:
OpenShift Merge Robot 2020-01-09 14:23:41 +01:00 committed by GitHub
parent 154b5ca85d 77994c4957
commit f57fdd038d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/podmanimage/stable/Dockerfile
View File

@ -9,9 +9,9 @@
FROM fedora:latest FROM fedora:latest
# Don't include container-selinux and remove # 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. # 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. # 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 RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf

4
contrib/podmanimage/testing/Dockerfile
View File

@ -11,9 +11,9 @@
FROM fedora:latest FROM fedora:latest
# Don't include container-selinux and remove # 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. # 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. # 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 RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf

6
contrib/podmanimage/upstream/Dockerfile
View File

@ -17,7 +17,7 @@ ENV GOPATH=/root/podman
# to the container. # to the container.
# Finally remove the podman directory and a few other packages # Finally remove the podman directory and a few other packages
# that are needed for building but not running Podman # 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 \ --enablerepo=updates-testing \
atomic-registries \ atomic-registries \
btrfs-progs-devel \ btrfs-progs-devel \
@ -63,8 +63,8 @@ RUN dnf -y install --exclude container-selinux \
# Adjust libpod.conf to write logging to a file # Adjust libpod.conf to write logging to a file
sed -i 's/# events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf; \ sed -i 's/# events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf; \
rm -rf /root/podman/*; \ rm -rf /root/podman/*; \
dnf -y remove git golang go-md2man make; \ yum -y remove git golang go-md2man make; \
dnf clean all; yum clean all;
# Adjust storage.conf to enable Fuse storage. # 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 RUN sed -i -e 's|^#mount_program|mount_program|g' -e '/additionalimage.*/a "/var/lib/shared",' /etc/containers/storage.conf