summaryrefslogtreecommitdiff
path: root/contrib/podmanimage/upstream
diff options
context:
space:
mode:
authorTomSweeneyRedHat <tsweeney@redhat.com>2019-06-08 21:31:41 -0400
committerTomSweeneyRedHat <tsweeney@redhat.com>2019-06-08 21:31:46 -0400
commitcdffb694930db5ebd0be089e3fc7895108d06f61 (patch)
tree52700ccefd9189fefbc3fccdbfcb3d9f68833a6b /contrib/podmanimage/upstream
parent39f5ea4c040d60f5f16b85ab144ddacf4cbba4c8 (diff)
downloadpodman-cdffb694930db5ebd0be089e3fc7895108d06f61.tar.gz
podman-cdffb694930db5ebd0be089e3fc7895108d06f61.tar.bz2
podman-cdffb694930db5ebd0be089e3fc7895108d06f61.zip
Touchup upstream Dockerfile
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>
Diffstat (limited to 'contrib/podmanimage/upstream')
-rw-r--r--contrib/podmanimage/upstream/Dockerfile11
1 files changed, 5 insertions, 6 deletions
diff --git a/contrib/podmanimage/upstream/Dockerfile b/contrib/podmanimage/upstream/Dockerfile
index 6ab082efc..3583e1c54 100644
--- a/contrib/podmanimage/upstream/Dockerfile
+++ b/contrib/podmanimage/upstream/Dockerfile
@@ -21,7 +21,6 @@ RUN dnf -y install --exclude container-selinux \
--enablerepo=updates-testing \
atomic-registries \
btrfs-progs-devel \
- conmon \
containernetworking-cni \
device-mapper-devel \
git \
@@ -49,7 +48,7 @@ RUN dnf -y install --exclude container-selinux \
make BUILDTAGS="selinux seccomp"; \
make install PREFIX=/usr; \
cd /root/podman; \
- git clone https://github.com/containers/conmon; \
+ git clone https://github.com/containers/conmon /root/podman/conmon; \
cd conmon; \
make; \
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; \
./build_linux.sh; \
mkdir -p /usr/libexec/cni; \
- cp bin/* /usr/libexec/cni; \
+ \cp -fR bin/* /usr/libexec/cni; \
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; \
- 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
sed -i 's/events_logger = "journald"/events_logger = "file"/g' /usr/share/containers/libpod.conf; \
rm -rf /root/podman/*; \
- dnf -y remove bats git golang go-md2man make; \
+ dnf -y remove git golang go-md2man make; \
dnf clean all;
# Adjust storage.conf to enable Fuse storage.