Skip to content

Commit

Permalink
Workflow and UID fixes (#272)
Browse files Browse the repository at this point in the history
  • Loading branch information
ladatz authored Mar 11, 2024
1 parent ad58e6c commit 39f570e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/containerize.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lt-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.service_discovery.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 39f570e

Please sign in to comment.