Improve slim build and publish additional -slim images (#19)

Author: Miggets7

.github/workflows/postgresql.yml

@@ -102,23 +102,22 @@ jobs:
             --no-cache-filter trimmed-all \
             $TAG .
 
-#      - name: Install slim toolkit
-#        run: |
-#          curl -sL https://raw.githubusercontent.com/slimtoolkit/slim/master/scripts/install-slim.sh | sudo -E bash -
-#
-#      - name: Slim the image
-#        run: |
-#          # Extract image name from TAG (remove -t prefix)
-#          IMAGE_NAME=$(echo "$TAG" | sed 's/-t //')
-#          chmod +x ./slim-image.sh
-#          ./slim-image.sh "$IMAGE_NAME" "${IMAGE_NAME}-slim" amd64
-#          # Replace original with slim version
-#          docker tag ${IMAGE_NAME}-slim $IMAGE_NAME
-#
+      - name: Install slim toolkit
+        run: |
+          curl -sL https://raw.githubusercontent.com/slimtoolkit/slim/master/scripts/install-slim.sh | sudo -E bash -
+
+      - name: Slim the image
+        run: |
+          # Extract image name from TAG (remove -t prefix)
+          IMAGE_NAME=$(echo "$TAG" | sed 's/-t //')
+          chmod +x ./slim-image.sh
+          ./slim-image.sh "$IMAGE_NAME" "${IMAGE_NAME}-slim" amd64
+
       - name: Push amd64 image
         run: |
           IMAGE_NAME=$(echo "$TAG" | sed 's/-t //')
           docker push $IMAGE_NAME
+          docker push ${IMAGE_NAME}-slim
 
   image_postgresql_arm64:
     needs: image_postgresql_amd64
@@ -203,19 +202,18 @@ jobs:
         run: |
           curl -sL https://raw.githubusercontent.com/slimtoolkit/slim/master/scripts/install-slim.sh | sudo -E bash -
 
-#      - name: Slim the image
-#        run: |
-#          # Extract image name from TAG (remove -t prefix)
-#          IMAGE_NAME=$(echo "$TAG" | sed 's/-t //')
-#          chmod +x ./slim-image.sh
-#          ./slim-image.sh "$IMAGE_NAME" "${IMAGE_NAME}-slim" arm64
-#          # Replace original with slim version
-#          docker tag ${IMAGE_NAME}-slim $IMAGE_NAME
+      - name: Slim the image
+        run: |
+          # Extract image name from TAG (remove -t prefix)
+          IMAGE_NAME=$(echo "$TAG" | sed 's/-t //')
+          chmod +x ./slim-image.sh
+          ./slim-image.sh "$IMAGE_NAME" "${IMAGE_NAME}-slim" arm64
 
       - name: Push arm64 image
         run: |
           IMAGE_NAME=$(echo "$TAG" | sed 's/-t //')
           docker push $IMAGE_NAME
+          docker push ${IMAGE_NAME}-slim
 
   create_manifest:
     needs: [image_postgresql_amd64, image_postgresql_arm64]
@@ -228,11 +226,18 @@ jobs:
             echo "TAG=openremote/postgresql:develop" >> $GITHUB_ENV
             echo "TAG_AMD64=openremote/postgresql:develop-amd64" >> $GITHUB_ENV
             echo "TAG_ARM64=openremote/postgresql:develop-arm64" >> $GITHUB_ENV
+            echo "TAG_SLIM=openremote/postgresql:develop-slim" >> $GITHUB_ENV
+            echo "TAG_SLIM_AMD64=openremote/postgresql:develop-slim-amd64" >> $GITHUB_ENV
+            echo "TAG_SLIM_ARM64=openremote/postgresql:develop-slim-arm64" >> $GITHUB_ENV
           else
             echo "TAG=openremote/postgresql:$TAG" >> $GITHUB_ENV
             echo "TAG_LATEST=openremote/postgresql:latest" >> $GITHUB_ENV
             echo "TAG_AMD64=openremote/postgresql:$TAG-amd64" >> $GITHUB_ENV
             echo "TAG_ARM64=openremote/postgresql:$TAG-arm64" >> $GITHUB_ENV
+            echo "TAG_SLIM=openremote/postgresql:$TAG-slim" >> $GITHUB_ENV
+            echo "TAG_SLIM_LATEST=openremote/postgresql:latest-slim" >> $GITHUB_ENV
+            echo "TAG_SLIM_AMD64=openremote/postgresql:$TAG-slim-amd64" >> $GITHUB_ENV
+            echo "TAG_SLIM_ARM64=openremote/postgresql:$TAG-slim-arm64" >> $GITHUB_ENV
           fi
         env:
           TAG: ${{ github.event.release.tag_name }}
@@ -249,3 +254,10 @@ jobs:
           if [ ! -z "$TAG_LATEST" ]; then
             docker buildx imagetools create -t $TAG_LATEST $TAG_AMD64 $TAG_ARM64
           fi
+          
+      - name: Create and push multi-arch manifest for slim images
+        run: |
+          docker buildx imagetools create -t $TAG_SLIM $TAG_SLIM_AMD64 $TAG_SLIM_ARM64
+          if [ ! -z "$TAG_SLIM_LATEST" ]; then
+            docker buildx imagetools create -t $TAG_SLIM_LATEST $TAG_SLIM_AMD64 $TAG_SLIM_ARM64
+          fi

slim-image.sh

@@ -44,7 +44,7 @@ echo "Slimming image: $SOURCE_IMAGE -> $TARGET_IMAGE (arch: $ARCH, lib: $LIB_ARC
 slim build --target "$SOURCE_IMAGE" \
     --tag "$TARGET_IMAGE" \
     --http-probe=false \
-    --continue-after=15 \
+    --continue-after=60 \
     --mount slim-pgdata:/var/lib/postgresql/data \
     --expose=5432 \
     --expose=8008 \
@@ -55,10 +55,10 @@ slim build --target "$SOURCE_IMAGE" \
     --include-path=/usr/share/postgresql-common \
     --include-path=/usr/share/proj \
     --include-path=/usr/share/gdal \
-	--include-path=/usr/share/pgbouncer \
-	--include-path=/usr/share/locales \
+    --include-path=/usr/share/pgbouncer \
+    --include-path=/usr/share/locales \
     --include-path=/etc/alternatives \
-	--include-path=/usr/local/bin \
+    --include-path=/usr/local/bin \
     --preserve-path=/var/lib/postgresql \
     --preserve-path=/docker-entrypoint-initdb.d \
     --preserve-path=/or-entrypoint.sh \
@@ -89,7 +89,17 @@ slim build --target "$SOURCE_IMAGE" \
     --include-bin=/bin/cp \
     --include-bin=/bin/touch \
     --include-bin=/usr/bin/id \
-    --include-bin=/usr/bin/env
+    --include-bin=/usr/bin/env \
+    --include-bin=/bin/sleep \
+    --include-bin=/usr/bin/ls \
+    --include-bin=/usr/bin/test \
+    --include-bin=/usr/bin/psql \
+    --include-bin=/usr/bin/pg_isready \
+    --include-bin=/usr/bin/locale \
+    --include-bin=/usr/bin/localedef \
+    --include-bin=/usr/bin/less \
+    --include-bin=/bin/ln \
+    --include-bin=/usr/bin/chown
 
 # delete volume to always start with an empty PGDATA directory
 docker volume rm slim-pgdata