Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workflow and UID fixes #272

Merged
merged 1 commit into from
Mar 11, 2024
Merged

Workflow and UID fixes #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/containerize.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading