Skip to content

Commit

Permalink
refactor: fix dockerfile and use new tags (#159)
Browse files Browse the repository at this point in the history
  • Loading branch information
rdash99 authored Jul 18, 2024
1 parent 497cac1 commit 83bb15e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/multi-container-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ jobs:
# Job name must be unique across repo to target
# branch protection rules "required checks" properly!
setup:
uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-repo.yaml@feat/allow-for-functionality-to-support-releasing-multiple-assets-bundled-with-the-same-tag
uses: SwanseaUniversityMedical/workflows/.github/workflows/pr-and-release-repo.yaml@v1.0.0-repo
with:
job-name: setup
release-tag-format: 'v${version}-bulk-release-test'

controller-container:
needs: setup
uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-container.yaml@feat/allow-for-functionality-to-support-releasing-multiple-assets-bundled-with-the-same-tag
uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-container.yaml@v1.0.0-bulk-containers
with:
job-name: controller-container
comment-pr: "true"
Expand All @@ -65,7 +65,7 @@ jobs:

trino-container:
needs: setup
uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-container.yaml@feat/allow-for-functionality-to-support-releasing-multiple-assets-bundled-with-the-same-tag
uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-container.yaml@v1.0.0-bulk-containers
with:
job-name: trino-container
comment-pr: "true"
Expand All @@ -79,15 +79,14 @@ jobs:
cosign-public-key: ${{ vars.COSIGN_PUBLIC_KEY }}
build-file: containers/trino/Dockerfile
build-context: containers/trino
test-flags: error
secrets:
cosign-private-key: ${{ secrets.COSIGN_PRIVATE_KEY }}
cosign-password: ${{ secrets.COSIGN_PASSWORD }}
registry-token: ${{ secrets.HARBOR_TOKEN }}

fizzbuzz-chart:
needs: setup
uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-chart.yaml@feat/allow-for-functionality-to-support-releasing-multiple-assets-bundled-with-the-same-tag
uses: SwanseaUniversityMedical/workflows/.github/workflows/bulk-pr-and-release-chart.yaml@v1.0.0-bulk-charts
with:
job-name: fizzbuzz-chart
comment-pr: "true"
Expand All @@ -100,7 +99,7 @@ jobs:
cosign-public-key: ${{ vars.COSIGN_PUBLIC_KEY }}
chart: charts/fizzbuzz
test-command: |
helm templat
helm template $CHART --debug
secrets:
cosign-private-key: ${{ secrets.COSIGN_PRIVATE_KEY }}
Expand Down
2 changes: 1 addition & 1 deletion containers/controller/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.20

#COPY src/requirements.txt /opt/requirements.txt
COPY src/requirements.txt /opt/requirements.txt

RUN apk update && \
apk add --update --no-cache python3 py3-pip && \
Expand Down

0 comments on commit 83bb15e

Please sign in to comment.