refactor(spilo): Rework spilo image for multi-container build

images/.utils/gitlab-ci.yaml

@@ -15,7 +15,7 @@ container-build:
           - findmydevice-server
           - opentf
           - cowsay
-          - splio-vectorrs
+          - splio
   script:
     - cd images/${IMAGE}
     - |

images/splio-vectorrs/.release

-release=2

images/splio/.release

+release=0

images/splio-vectorrs/Earthfile → images/splio/Earthfile

 VERSION 0.7
 
 container:
+    BUILD +container-spilo
+    BUILD +container-pgvectors
+
+container-spilo:
     FROM ghcr.io/zalando/spilo-15:3.0-p1
-    ARG registry=quay.io/shivering-isles/splio-vectorrs
+    ARG registry=quay.io/shivering-isles/splio
     COPY .release ./
+    ENV PG_VERSION=$(pg_config --version | sed -e 's/PostgreSQL //' -e 's/\..*//')
+    ENV SI_REVISION=$(awk -F'=' '$1 == "release" {print $2}' .release)
+    ARG tag=$PG_VERSION-$(echo $PATRONIVERSION | cut -d'.' -f 1-2)-r$SI_REVISION
+    DO ../.utils/+LABEL --image=spilo --version=main
+    IF [ $latest = "true" ]
+        SAVE IMAGE --push ${registry}:latest
+    ELSE
+        LABEL "quay.expires-after"="12w"
+    END
+    SAVE IMAGE --push ${registry}:${tag}
+
+container-pgvectors:
+    FROM +container-spilo
+    ARG registry=quay.io/shivering-isles/splio
     # renovate: datasource=github-releases depName=tensorchord/pgvecto.rs
     ARG PG_VECTORS_VERSION=v0.2.0
-    ENV PG_VERSION=$(pg_config --version | sed -e 's/PostgreSQL //' -e 's/\..*//')
-    ARG tag=$PG_VERSION-$(echo $PATRONIVERSION | cut -d'.' -f 1-2)-pg${PG_VECTORS_VERSION}-r$(awk -F'=' '$1 == "release" {print $2}' .release)
+    ARG tag=$PG_VERSION-$(echo $PATRONIVERSION | cut -d'.' -f 1-2)-pg${PG_VECTORS_VERSION}-r${SI_REVISION}
     ARG latest=false
     ARG VECTORS_DEB="./vectors-pg${PG_VERSION}_amd64.deb"
     RUN curl -L https://github.com/tensorchord/pgvecto.rs/releases/download/${PG_VECTORS_VERSION}/vectors-pg${PG_VERSION}_$(echo $PG_VECTORS_VERSION  | sed -e 's/^v//')_amd64.deb > "$VECTORS_DEB"
     RUN apt install "$VECTORS_DEB"
     RUN rm "$VECTORS_DEB"
-    DO ../.utils/+LABEL --image=postfix --version=main
+    DO ../.utils/+LABEL --image=spilo --version=main
     IF [ $latest = "true" ]
-        SAVE IMAGE --push ${registry}:latest
+        SAVE IMAGE --push ${registry}:latest-pg${PG_VECTORS_VERSION}
     ELSE
         LABEL "quay.expires-after"="12w"
     END