opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-04 21:55:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Touchup upstream Dockerfile

Browse Source 
The upstream/Dockerfile had a few issues that this
cleans up.  A few files were misplaced, wrong installs
and removes.  This corrects those issues.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
This commit is contained in:
TomSweeneyRedHat
2019-06-08 21:31:41 -04:00
parent 39f5ea4c04
commit cdffb69493
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/podmanimage/upstream/Dockerfile
View File

@ -21,7 +21,6 @@ RUN dnf -y install --exclude container-selinux \
--enablerepo=updates-testing \ --enablerepo=updates-testing \
atomic-registries \ atomic-registries \
btrfs-progs-devel \ btrfs-progs-devel \
conmon \
containernetworking-cni \ containernetworking-cni \
device-mapper-devel \ device-mapper-devel \
git \ git \
@ -49,7 +48,7 @@ RUN dnf -y install --exclude container-selinux \
make BUILDTAGS="selinux seccomp"; \ make BUILDTAGS="selinux seccomp"; \
make install PREFIX=/usr; \ make install PREFIX=/usr; \
cd /root/podman; \ cd /root/podman; \
git clone https://github.com/containers/conmon; \ git clone https://github.com/containers/conmon /root/podman/conmon; \
cd conmon; \ cd conmon; \
make; \ make; \
install -D -m 755 bin/conmon /usr/libexec/podman/conmon; \ install -D -m 755 bin/conmon /usr/libexec/podman/conmon; \
@ -57,15 +56,15 @@ RUN dnf -y install --exclude container-selinux \
cd $GOPATH/src/github.com/containernetworking/plugins; \ cd $GOPATH/src/github.com/containernetworking/plugins; \
./build_linux.sh; \ ./build_linux.sh; \
mkdir -p /usr/libexec/cni; \ mkdir -p /usr/libexec/cni; \
cp bin/* /usr/libexec/cni; \ \cp -fR bin/* /usr/libexec/cni; \
mkdir -p /etc/cni/net.d; \ mkdir -p /etc/cni/net.d; \
curl -qsSL https://raw.githubusercontent.com/containers/libpod/master/cni/87-podman-bridge.conflist | sudo tee /etc/cni/net.d/99-loopback.conf; \ curl -qsSL https://raw.githubusercontent.com/containers/libpod/master/cni/87-podman-bridge.conflist | tee /etc/cni/net.d/99-loopback.conf; \
mkdir -p /usr/share/containers; \ mkdir -p /usr/share/containers; \
cp $GOPATH/podman/src/github.com/containers/libpod/libpod.conf /usr/share/containers; \ cp $GOPATH/src/github.com/containers/libpod/libpod.conf /usr/share/containers; \
# 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 bats git golang go-md2man make; \ dnf -y remove git golang go-md2man make; \
dnf clean all; dnf clean all;
# Adjust storage.conf to enable Fuse storage. # Adjust storage.conf to enable Fuse storage.