aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2020-07-16 11:29:52 +0200
committerGerd Hoffmann <kraxel@redhat.com>2020-07-16 11:29:52 +0200
commit3fbd557931bc2b324429a9379ac2abb6f0ca0e65 (patch)
tree153bf6a238020c1116b0d2674f201f3d0d97d10d
parent37eb1d7686f5d09eb8bf1a92efe94c1f0c2a60c1 (diff)
downloadpodman-docker-builder-3fbd557931bc2b324429a9379ac2abb6f0ca0e65.tar.gz
cosmetics for the logs
-rwxr-xr-xconfigure-podman12
1 files changed, 7 insertions, 5 deletions
diff --git a/configure-podman b/configure-podman
index 1ccd95a..551d607 100755
--- a/configure-podman
+++ b/configure-podman
@@ -1,23 +1,25 @@
#!/bin/sh
#
-# need to tweak some config options so "podman build" can run inside a container
+# need to tweak some config options so "podman build" can run inside a docker container in gitlab ci
#
-# update & install packages
+echo "# update & install packages"
dnf update -y
dnf install -y podman podman-docker buildah
dnf clean all -y
-# storage: can't use overlay (can't be stacked).
+# storage: can't use overlay, docker does that already and it can't be nested.
+echo "# update podman storage config"
sed -i.orig -e '/^driver/s/overlay/vfs/' /etc/containers/storage.conf
diff -u /etc/containers/storage.conf.orig /etc/containers/storage.conf
-# cgroups: no systemd, so use cgroupfs directly
+# cgroups: there is no systemd managing the container, so use cgroupfs directly
+echo "# update podman cgroups config"
cp /usr/share/containers/libpod.conf /etc/containers
sed -i.orig -e '/^cgroup_manager/s/systemd/cgroupfs/' /etc/containers/libpod.conf
diff -u /etc/containers/libpod.conf.orig /etc/containers/libpod.conf
-# silence emulation notification
+echo "# silence docker emulation notification"
touch /etc/containers/nodocker
exit 0