cicd fixes

Author: riccardopinosio

.github/workflows/build-push.yaml

@@ -39,7 +39,6 @@ jobs:
         with:
           context: .
           push: true
-          target: hugot-runtime
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 

.github/workflows/release.yaml

@@ -85,7 +85,6 @@ jobs:
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
           context: .
-          target: hugot-runtime
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -4,7 +4,8 @@ ARG GO_VERSION=1.24.5
 ARG ONNXRUNTIME_VERSION=1.22.0
 ARG BUILD_PLATFORM=linux/amd64
 
-#--- runtime layer with all hugot dependencies for cpu ---
+#--- runtime layer with all hugot dependencies for cpu 
+#--- the image generated does not contain the hugot code, only the dependencies needed by hugot and the compiled cli binary
 
 FROM --platform=$BUILD_PLATFORM public.ecr.aws/amazonlinux/amazonlinux:2023 AS hugot-runtime
 ARG GO_VERSION
@@ -39,27 +40,9 @@ RUN --mount=src=./go.mod,dst=/go.mod \
     useradd -u 1000 -m testuser && usermod -a -G wheel testuser && \
     echo "testuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/testuser
 
-#--- test layer ---
-
-FROM --platform=$BUILD_PLATFORM hugot-runtime AS hugot-build
-
 COPY . /build
-
 RUN cd /build && \
     chown -R testuser:testuser /build && \
     # cli binary
     cd /build/cmd && CGO_ENABLED=1 CGO_LDFLAGS="-L/usr/lib/" GOOS=linux GOARCH=amd64 go build -tags "ALL" -a -o /cli main.go && \
-    cd / && \
-    curl -LO https://github.com/gotestyourself/gotestsum/releases/download/v1.12.0/gotestsum_1.12.0_linux_amd64.tar.gz && \
-    tar -xzf gotestsum_1.12.0_linux_amd64.tar.gz --directory /usr/local/bin && \
-    # entrypoint
-    cp /build/scripts/entrypoint.sh /entrypoint.sh && sed -i 's/\r//g' /entrypoint.sh && chmod +x /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]
-
-#--- artifacts layer ---
-FROM --platform=$BUILD_PLATFORM scratch AS artifacts
-
-COPY --from=hugot-build /usr/lib64/onnxruntime.so onnxruntime-linux-x64.so
-COPY --from=hugot-build /usr/lib/libtokenizers.a libtokenizers.a
-COPY --from=hugot-build /cli /hugot-cli-linux-x64
+    cd / && rm -rf /build

compose-test.yaml

@@ -1,12 +1,22 @@
 services:
   hugot:
-    image: hugot:$commit_hash
+    image: hugot:latest
     platform: linux/amd64
-    container_name: hugot
     build:
       context: .
       dockerfile: ./Dockerfile
-      target: hugot-build
+    # This service is build-only and not started
+    entrypoint: ["/bin/true"]
+
+  hugot-test:
+    platform: linux/amd64
+    container_name: hugot-test
+    build:
+      context: .
+      dockerfile: ./test.Dockerfile
+      target: hugot-test
+    depends_on:
+      - hugot
     volumes:
       - $test_folder:/test
       - $test_folder/../scripts/run-unit-tests-container.sh:/run-unit-tests-container.sh

scripts/run-unit-tests.sh

@@ -31,11 +31,12 @@ fi
 
 # build with compose
 docker compose -f "$src_dir/compose-test.yaml" build
+
 echo "Running tests for commit hash: $commit_hash"
 docker compose -f "$src_dir/compose-test.yaml" up && \
 docker compose -f "$src_dir/compose-test.yaml" logs --no-color >& "$test_folder/logs.txt"
 docker compose -f "$src_dir/compose-test.yaml" rm -fsv
 
 echo "Extracting lib artifacts"
-docker build -f ./Dockerfile . --output "$src_dir/artifacts" --target artifacts
+docker build -f ./test.Dockerfile . --output "$src_dir/artifacts" --target artifacts
 echo "lib artifacts extracted"

test.Dockerfile

@@ -0,0 +1,21 @@
+ARG BUILD_PLATFORM=linux/amd64
+
+FROM --platform=$BUILD_PLATFORM hugot:latest AS hugot-test
+
+COPY . /build
+
+RUN cd /build && \
+    chown -R testuser:testuser /build && \
+    curl -LO https://github.com/gotestyourself/gotestsum/releases/download/v1.12.3/gotestsum_1.12.3_linux_amd64.tar.gz && \
+    tar -xzf gotestsum_1.12.3_linux_amd64.tar.gz --directory /usr/local/bin && \
+    # entrypoint
+    cp /build/scripts/entrypoint.sh /entrypoint.sh && sed -i 's/\r//g' /entrypoint.sh && chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+#--- artifacts layer ---
+FROM --platform=$BUILD_PLATFORM scratch AS artifacts
+
+COPY --from=hugot-build /usr/lib64/onnxruntime.so onnxruntime-linux-x64.so
+COPY --from=hugot-build /usr/lib/libtokenizers.a libtokenizers.a
+COPY --from=hugot-build /cli /hugot-cli-linux-x64