Cleanup base sources (pt. 1)

Signed-off-by: Christian Berendt <[email protected]>

files/cleanup-base-sources.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+for e in $(find /*-base-source -name '*config-generator*'); do
+    if [[ -d $e ]]; then
+        mkdir -p /x/$e
+        cp -r $e/* /x/$e
+    else
+        f=$(dirname $e)
+        mkdir -p /x/$f
+        cp -r $f/* /x/$f
+    fi
+done
+
+rm -rf /*-base-source
+mv /x/* /
+rm -rf /x

scripts/004-build.sh

@@ -42,6 +42,9 @@ done
 
 # Build & squash base images
 
+# The line can be commented out for tests to build keystone images only.
+KOLLA_IMAGES_BASE=^keystone-base
+
 kolla-build \
   --template-override templates/$OPENSTACK_VERSION/template-overrides.j2 \
   --config-file $KOLLA_CONF \
@@ -52,6 +55,9 @@ kolla-build \
 
 # Build images
 
+# The line can be commented out for tests to build keystone images only.
+KOLLA_IMAGES=^keystone
+
 kolla-build \
   --template-override templates/$OPENSTACK_VERSION/template-overrides.j2 \
   --config-file $KOLLA_CONF \
@@ -65,4 +71,10 @@ if grep -q "Failed with status: error" kolla-build-$BUILD_ID.log; then
     exit 1
 fi
 
+# Cleanup images
+
+python3 src/cleanup-images.py
+
+# List images
+
 docker images

src/cleanup-images.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+
+import os
+import tempfile
+
+from docker import DockerClient
+from loguru import logger
+
+VERSION = os.environ.get("OPENSTACK_VERSION", "zed")
+FILTERS = {"label": f"de.osism.release.openstack={VERSION}"}
+
+client = DockerClient()
+
+for image in client.images.list(filters=FILTERS):
+    # skip images without a tag
+    if not image.tags:
+        continue
+
+    tag = image.tags[0]
+    logger.info(f"Cleaning up image {tag}")
+
+    with tempfile.NamedTemporaryFile() as fp:
+        fp.write(f"FROM {tag}\n".encode())
+
+        # full source directory required in the bifrost image
+        if "bifrost" not in tag:
+            fp.write(f"COPY files/cleanup-base-sources.sh /cleanup-base-sources.sh\n".encode())
+            fp.write(f"RUN bash /cleanup-base-sources.sh\n".encode())
+            fp.write(f"RUN rm /cleanup-base-sources.sh\n".encode())
+
+        fp.seek(0)
+
+        client.images.build(fileobj=fp, tag=tag, squash=True)
+
+        cmd = "docker-squash --tag {tag} --from-layer 1 {tag}"
+        subprocess.check_output(cmds, stderr=subprocess.STDOUT)