Skip to content

Commit 289912a

Browse files
author
oscar
committed
Update docker-publish.yml
1 parent d5e1a8b commit 289912a

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/docker-publish.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121

2222
env:
2323
REGISTRY: docker.io
24-
IMAGE_NAME_PREFIX: ${{ github.repository_owner }}
24+
IMAGE_NAME_BASE: ${{ github.repository_owner }}
2525

2626
jobs:
2727
build-and-push:
@@ -37,10 +37,10 @@ jobs:
3737
context: .
3838
- dockerfile: ./grafana/Dockerfile
3939
image_name: digger-grafana
40-
context: .
40+
context: ./grafana
4141
- dockerfile: ./pcap_broker/Dockerfile
4242
image_name: digger-pcap-broker
43-
context: .
43+
context: ./pcap_broker
4444

4545
permissions:
4646
contents: read
@@ -61,13 +61,13 @@ jobs:
6161

6262
- name: Convert owner to lowercase
6363
id: lowercase_owner
64-
run: echo "owner=$(echo ${{ env.IMAGE_NAME_PREFIX }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
64+
run: echo "owner=$(echo ${{ env.IMAGE_NAME_BASE }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
6565

6666
- name: Extract metadata
6767
id: meta
6868
uses: docker/metadata-action@v5
6969
with:
70-
images: ${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/${{ matrix.image_name }}
70+
images: ${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/digger-${{ matrix.image_name }}
7171
tags: |
7272
type=ref,event=branch
7373
type=semver,pattern={{version}}
@@ -83,8 +83,8 @@ jobs:
8383
push: ${{ secrets.DOCKER_USERNAME != '' && secrets.DOCKER_PASSWORD != '' }}
8484
tags: ${{ steps.meta.outputs.tags }}
8585
labels: ${{ steps.meta.outputs.labels }}
86-
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/${{ matrix.image_name }}:buildcache
87-
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/${{ matrix.image_name }}:buildcache,mode=max
86+
cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/digger-${{ matrix.image_name }}:buildcache
87+
cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/digger-${{ matrix.image_name }}:buildcache,mode=max
8888

8989
summary:
9090
runs-on: ubuntu-latest
@@ -93,7 +93,7 @@ jobs:
9393
steps:
9494
- name: Convert owner to lowercase
9595
id: lowercase_owner
96-
run: echo "owner=$(echo ${{ env.IMAGE_NAME_PREFIX }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
96+
run: echo "owner=$(echo ${{ env.IMAGE_NAME_BASE }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
9797
- name: Create job summary
9898
run: |
9999
echo "## Docker Images Published" >> $GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)