Tentative: multi-staged builds

Signed-off-by: Silvio Moioli <[email protected]>

Author: moio

containers/proxy-salt-broker-image/Dockerfile

@@ -2,7 +2,7 @@
 
 # HACK: Open Build Service currently only supports short names. Assume short name by default, allow to override to qualified name via ARG
 ARG BASE_IMAGE_PREFIX=
-FROM ${BASE_IMAGE_PREFIX}suse/sle15:15.3
+FROM ${BASE_IMAGE_PREFIX}suse/sle15:15.3 AS fat
 
 # Distro repos
 RUN zypper addrepo http://download.opensuse.org/distribution/leap/15.3/repo/oss/ main
@@ -11,6 +11,23 @@ RUN zypper addrepo http://download.opensuse.org/update/leap/15.3/sle/ updates
 # Product repos
 RUN zypper addrepo https://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master/images/repo/Uyuni-Proxy-POOL-x86_64-Media1/ product
 
+# Main packages
+RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-licenses spacewalk-proxy-salt
+
+# Additional material
+COPY uyuni-configure.py /usr/bin/uyuni-configure.py
+RUN chmod +x /usr/bin/uyuni-configure.py
+
+# Prepare for slimming down
+COPY prepare_target.sh .
+RUN sh prepare_target.sh
+
+# Define slim image
+FROM ${BASE_IMAGE_PREFIX}suse/sle15:15.3 AS slim
+
+RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-licenses python3 python3-PyYAML python3-pyzmq
+COPY --from=fat /target /
+
 # Build Service required labels
 # labelprefix=org.opensuse.uyuni.proxy-salt-broker
 LABEL org.opencontainers.image.title="Proxy salt-broker container"
@@ -26,9 +43,4 @@ EXPOSE 4506/tcp
 
 VOLUME "/etc/uyuni"
 
-RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-licenses spacewalk-proxy-salt
-
-COPY uyuni-configure.py /usr/bin/uyuni-configure.py
-RUN chmod +x /usr/bin/uyuni-configure.py
-
 CMD uyuni-configure.py && salt-broker

containers/proxy-salt-broker-image/prepare_target.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# Moves to /target any file to be preserved in the slimmed-down image
+
+set -xe
+
+mkdir -p /target/etc/rhn
+mv /etc/rhn/rhn*.conf /target/etc/rhn/rhn.conf
+
+mkdir -p /target/etc/salt
+mv /etc/salt/broker /target/etc/salt
+
+mkdir -p /target/usr/share/rhn/config-defaults
+mv /usr/share/rhn/config-defaults/rhn*.conf /target/usr/share/rhn/config-defaults
+
+mkdir -p /target/usr/bin
+mv /usr/bin/salt-broker /target/usr/bin/
+mv /usr/bin/uyuni-configure.py /target/usr/bin/
+
+SITE_PACKAGES=usr/lib/$(ls /usr/lib/ | grep python)/site-packages
+mkdir -p /target/$SITE_PACKAGES
+mv /$SITE_PACKAGES/spacewalk /target/$SITE_PACKAGES
+mv /$SITE_PACKAGES/rhn /target/$SITE_PACKAGES
+mv /$SITE_PACKAGES/uyuni /target/$SITE_PACKAGES
+
+mkdir -p /target/var/log/salt