From 39f570e0339a002daee1918e00920001078dd59c Mon Sep 17 00:00:00 2001
From: ladatz <105828115+ladatz@users.noreply.github.com>
Date: Mon, 11 Mar 2024 17:36:08 -0400
Subject: [PATCH] Workflow and UID fixes (#272)

---
 .github/workflows/containerize.yaml | 2 +-
 .github/workflows/e2e-ci.yml        | 2 +-
 .github/workflows/lt-ci.yml         | 2 +-
 Dockerfile.service_discovery.arm64  | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/containerize.yaml b/.github/workflows/containerize.yaml
index b195c703..596baf9d 100644
--- a/.github/workflows/containerize.yaml
+++ b/.github/workflows/containerize.yaml
@@ -17,7 +17,7 @@ on:
     paths:
       - "intent_brokering/src/**"
       - "intent_brokering/proto/**"
-      - "Dockerfile.intent_brokering"
+      - "Dockerfile.intent_brokering.amd64"
       - ".github/workflows/containerize.yaml"
       - "rust-toolchain.toml"
 
diff --git a/.github/workflows/e2e-ci.yml b/.github/workflows/e2e-ci.yml
index 1fabd772..f1e31e5f 100644
--- a/.github/workflows/e2e-ci.yml
+++ b/.github/workflows/e2e-ci.yml
@@ -50,7 +50,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./Dockerfile.intent_brokering
+          file: ./Dockerfile.intent_brokering.amd64
           load: true
           tags: intent_brokering:1
 
diff --git a/.github/workflows/lt-ci.yml b/.github/workflows/lt-ci.yml
index 2f17f722..131ae307 100644
--- a/.github/workflows/lt-ci.yml
+++ b/.github/workflows/lt-ci.yml
@@ -57,7 +57,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: Dockerfile.intent_brokering
+          file: Dockerfile.intent_brokering.amd64
           load: true
           tags: intent_brokering:1
 
diff --git a/Dockerfile.service_discovery.arm64 b/Dockerfile.service_discovery.arm64
index f293cd0c..124e92f4 100644
--- a/Dockerfile.service_discovery.arm64
+++ b/Dockerfile.service_discovery.arm64
@@ -22,11 +22,11 @@ WORKDIR /sdv
 
 COPY ./ .
 
-# Check that UID argument is valid.
+# Check that CHARIOTT_UID argument is valid.
 RUN /sdv/container/scripts/argument_sanitizer.sh \
-    --arg-value "${UID}" \
+    --arg-value "${CHARIOTT_UID}" \
     --regex "^[0-9]+$" || \
-    ( echo "Argument sanitizer failed for ARG 'UID'"; exit 1 )
+    ( echo "Argument sanitizer failed for ARG 'CHARIOTT_UID'"; exit 1 )
 
 # unprivileged identity to run Chariott Service Discovery as
 RUN adduser \