Build works

Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com>

Author: pierDipi

hack/build.sh

@@ -2,9 +2,22 @@
 
 source "$(dirname $0)/common.sh"
 
+err_report() {
+    echo "!!! Error on line $1 !!!"
+    exit 1
+}
+
+set -T          # inherit DEBUG and RETURN trap for functions
+set -C          # prevent file overwrite by > &> <>
+set -E          # inherit -e
+set -e          # exit immediately on errors
+set -u          # exit on not assigned variables
+set -o pipefail # exit on pipe failure
+
+trap 'err_report $LINENO' ERR
+
 export KO_DOCKER_REPO="${KO_DOCKER_REPO:-kind.local}"
 
 build_transform_jsonata_image || exit $?
-push_transform_jsonata_image || exit $?
 
-#build_integration_images || exit $?
+build_integration_images || exit $?

hack/common.sh

@@ -4,6 +4,7 @@ set -euo pipefail
 
 export TAG=${TAG:-$(git rev-parse HEAD)}
 
+export KO_DOCKER_REPO="${KO_DOCKER_REPO:-kind.local}"
 export TRANSFORM_JSONATA_IMAGE_WITH_TAG="${KO_DOCKER_REPO}/transform-jsonata:${TAG}"
 
 [[ ! -v REPO_ROOT_DIR ]] && REPO_ROOT_DIR="$(git rev-parse --show-toplevel)"
@@ -12,19 +13,18 @@ readonly REPO_ROOT_DIR
 function build_transform_jsonata_image() {
 
   docker version
+  docker buildx version
 
-  docker buildx build \
+  docker buildx build --debug \
     --platform "linux/amd64" \
     -t "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}-amd64" \
     -f "${REPO_ROOT_DIR}/transform-jsonata/Dockerfile" \
-    --output=type=docker \
     "${REPO_ROOT_DIR}/transform-jsonata" || return $?
 
-  docker buildx build \
+  docker buildx build --debug \
     --platform "linux/arm64" \
     -t "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}-arm64" \
     -f "${REPO_ROOT_DIR}/transform-jsonata/Dockerfile" \
-    --output=type=docker \
     "${REPO_ROOT_DIR}/transform-jsonata" || return $?
 }
 
@@ -33,15 +33,18 @@ function push_transform_jsonata_image() {
     docker push "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}-arm64" || return $?
 
     echo "Creating manifest ${TRANSFORM_JSONATA_IMAGE_WITH_TAG}"
-    docker manifest create "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}" \
+    docker manifest create --amend "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}" \
         "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}-amd64" \
         "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}-arm64" || return $?
 
     echo "Pushing manifest ${TRANSFORM_JSONATA_IMAGE_WITH_TAG}"
     docker manifest push "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}" || return $?
-    # TODO figure out digest properly
-#    TRANSFORM_JSONATA_IMAGE=$(docker inspect --format '{{index .RepoDigests 0}}' "${image}")
-#    export TRANSFORM_JSONATA_IMAGE
+
+    digest=$(docker buildx imagetools inspect "${TRANSFORM_JSONATA_IMAGE_WITH_TAG}" --format "{{json .Manifest.Digest }}" | tr -d '"')
+    TRANSFORM_JSONATA_IMAGE="${TRANSFORM_JSONATA_IMAGE_WITH_TAG}@${digest}"
+    export TRANSFORM_JSONATA_IMAGE
+
+    echo "TRANSFORM_JSONATA_IMAGE=${TRANSFORM_JSONATA_IMAGE}"
 }
 
 function build_integration_images() {

transform-jsonata/Dockerfile

@@ -1,4 +1,6 @@
-FROM registry.access.redhat.com/ubi9/nodejs-20 AS builder
+FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9/nodejs-20 AS builder
+
+ARG TARGETPLATFORM
 
 # Set working directory
 WORKDIR /app
@@ -22,7 +24,7 @@ COPY . .
 RUN pnpm build || echo "No build step found, skipping"
 
 # Use a minimal base image for runtime
-FROM registry.access.redhat.com/ubi9/nodejs-20
+FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9/nodejs-20
 
 ENV NODE_ENV=production
 

transform-jsonata/jsonata.js

@@ -40,7 +40,7 @@ const jsonata_response_transform_file_name = process.env.JSONATA_RESPONSE_TRANSF
 
 const jsonata_discard_response_body = process.env.JSONATA_DISCARD_RESPONSE_BODY === "true" || false;
 
-const jsonata_config_tracing = JSON.parse(process.env.JSONATA_CONFIG_TRACING || '{}')
+const jsonata_config_tracing = JSON.parse(process.env.K_TRACING_CONFIG || '{}')
 
 const oidc_token_file = process.env.OIDC_TOKEN_FILE || undefined
 if (oidc_token_file && !fs.existsSync(oidc_token_file)) {

transform-jsonata/package.json

@@ -4,7 +4,7 @@
   "scripts": {
     "dev": "NODE_ENV=development OIDC_TOKEN_FILE=./examples/example-token.txt JSONATA_TRANSFORM_FILE_NAME=./examples/jsonata_transform_identity.jsonata nodemon ./jsonata.js",
     "dev-kubevirt": "NODE_ENV=development OIDC_TOKEN_FILE=./examples/example-token.txt JSONATA_TRANSFORM_FILE_NAME=./examples/ce_apiserversource_kubevirt.jsonata nodemon ./jsonata.js",
-    "dev-zipkin": "NODE_ENV=development JSONATA_CONFIG_TRACING='{\"backend\":\"zipkin\", \"zipkin-endpoint\": \"http://localhost:9411/api/v2/spans\", \"sample-rate\":\"1\"}' OIDC_TOKEN_FILE=./examples/example-token.txt JSONATA_TRANSFORM_FILE_NAME=./examples/jsonata_transform_identity.jsonata nodemon ./jsonata.js"
+    "dev-zipkin": "NODE_ENV=development K_TRACING_CONFIG='{\"backend\":\"zipkin\", \"zipkin-endpoint\": \"http://localhost:9411/api/v2/spans\", \"sample-rate\":\"1\"}' OIDC_TOKEN_FILE=./examples/example-token.txt JSONATA_TRANSFORM_FILE_NAME=./examples/jsonata_transform_identity.jsonata nodemon ./jsonata.js"
   },
   "dependencies": {
     "jsonata": "^2.0.6",