fix

Author: ayuskauskas

.github/workflows/build_agent_container.yaml

@@ -51,14 +51,15 @@ jobs:
       - name: Build the agent container image
         id: build
         run: |
-          apt-get update && apt-get install -y make git
+          apt-get update && apt-get install -y make git jq
           cd agent
           export TAGS="-t ${REGISTRY@L}/${{env.IMAGE_NAME}}/agent:${{ github.sha }}"
           export REGISTRY=${REGISTRY@L}
           # Get the last tag and use it as the env var AGENT_VERSION if it doesn't exist use 0.0.0+{github.sha}
           export AGENT_VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0+${{ github.sha }}")
           make docker-build-only agent_version=${AGENT_VERSION}
-          echo "digest=$(docker inspect --format='{{index .RepoDigests 0}}' ${REGISTRY@L}/${{env.IMAGE_NAME}}/agent:${{ github.sha }} | cut -d: -f2)" >> $GITHUB_OUTPUT
+          cat metadata.json
+          echo "digest=$(cat metadata.json | jq -r .containerimage.digest)" >> $GITHUB_OUTPUT
         env:
           AGENT_IMAGE: ${{env.IMAGE_NAME}}/agent
 

agent/Makefile

@@ -71,7 +71,7 @@ ACTUAL_TAGS=$(shell echo "-t $(REGISTRY)/$(AGENT_IMAGE):$(shell date +%y.%m.%d-%
 .PHONY: docker-build-only
 docker-build-only:
 	@echo "Building skyhook-agent $(DOCKER_CMD) image with tags: $(ACTUAL_TAGS)"
-	$(DOCKER_CMD) buildx build $(BUILD_ARGS) --build-arg AGENT_VERSION=$(AGENT_VERSION) --platform linux/amd64,linux/arm64 $(ACTUAL_TAGS) -f docker/Dockerfile .
+	$(DOCKER_CMD) buildx build $(BUILD_ARGS) --build-arg AGENT_VERSION=$(AGENT_VERSION) --platform linux/amd64,linux/arm64 $(ACTUAL_TAGS) --metadata-file=metadata.json -f docker/Dockerfile .
 
 ##@ Docker Build
 .PHONY: docker-build

agent/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-alpine as builder
+FROM python:3.12-alpine AS builder
 
 ARG AGENT_VERSION
 
@@ -7,6 +7,7 @@ WORKDIR /code
 RUN echo "AGENT_VERSION=${AGENT_VERSION}"
 RUN apk update && apk add bash make
 RUN make venv
+RUN make test
 RUN make build build_version=${AGENT_VERSION}
 
 FROM python:3.12-alpine