aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorGravatar Joe Banks <[email protected]>2024-08-17 14:56:43 +0100
committerGravatar Joe Banks <[email protected]>2024-08-17 14:56:43 +0100
commit270aa073646962ad664c348056a6c24e586c9c9c (patch)
tree5bdd993d609bb4aa6353ca8627bcdcaf79e7fbd4 /.github
parentPass full path to Thallium Frontend Dockerfile (diff)
Generalise location of Dockerfile paths
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build-deploy.yaml2
-rw-r--r--.github/workflows/main.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build-deploy.yaml b/.github/workflows/build-deploy.yaml
index 177e82b..0eb1a4e 100644
--- a/.github/workflows/build-deploy.yaml
+++ b/.github/workflows/build-deploy.yaml
@@ -40,7 +40,7 @@ jobs:
uses: docker/build-push-action@v6
with:
context: thallium-${{ inputs.project }}
- file: ${{ inputs.dockerfile || 'Dockerfile' }}
+ file: thallium-${{ inputs.project }}/${{ inputs.dockerfile || 'Dockerfile' }}
push: ${{ github.ref == 'refs/heads/main' }}
cache-from: type=registry,ref=ghcr.io/owl-corp/thallium-${{ inputs.project }}:latest
cache-to: type=inline
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 04833bf..323b29f 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -68,5 +68,5 @@ jobs:
with:
sha-tag: ${{ needs.generate-inputs.outputs.sha-tag }}
project: frontend
- dockerfile: thallium-frontend/Dockerfile.development
+ dockerfile: Dockerfile.development
secrets: inherit