diff options
| author | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-01-08 14:19:26 -0500 |
|---|---|---|
| committer | TomSweeneyRedHat <tsweeney@redhat.com> | 2020-01-08 14:21:21 -0500 |
| commit | 77994c495753d31795e0888cefa959188f13c31c (patch) | |
| tree | 4e45790ef07c1efa14dbb14deab79963c4a65712 /contrib/podmanimage/upstream | |
| parent | c99b413abbc74f6f7e126d8bca58f44a3fcd9c2d (diff) | |
| download | podman-77994c495753d31795e0888cefa959188f13c31c.tar.gz podman-77994c495753d31795e0888cefa959188f13c31c.tar.bz2 podman-77994c495753d31795e0888cefa959188f13c31c.zip | |
Update podmanimage build process
(Stealing from: @rhatdan 's https://github.com/containers/buildah/pull/2038 )
1 We need to update all packages in the podman image to make sure they are
up2date.
2 reinstall shadow-utils. For some reason the fedora base image does not
include the file capabilities assigned to /usr/bin/newuidmap and
/usr/bin/newgidmap. Reinstalling shadow-utils, brings them back.
3 Add a default user build to the system. This will create the
/etc/subuid and /etc/subgid maps get created correctly.
Once we have this we should be able to build a container starting with a non
privileged user
podman run -ti --user build --device=/dev/fuse -v ./Dockerfile:/Dockerfile:z quay.io/podman/stable podman buildd /
Addresses: #4741
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
Diffstat (limited to 'contrib/podmanimage/upstream')
| -rw-r--r-- | contrib/podmanimage/upstream/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
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 |