From 22633f662252ae277f2849b83ed1196d6a8756d3 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Tue, 13 Aug 2024 21:08:28 +0200 Subject: [PATCH 1/3] Fix mistake in CI --- .github/workflows/docker-dns.yml | 2 +- .github/workflows/docker-nginx.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-dns.yml b/.github/workflows/docker-dns.yml index 40a0858..a4b3f51 100644 --- a/.github/workflows/docker-dns.yml +++ b/.github/workflows/docker-dns.yml @@ -48,7 +48,7 @@ jobs: id: build-and-push uses: docker/build-push-action@v6 with: - context: dns + context: ./dns platforms: linux/amd64,linux/arm64 push: ${{ env.SHOULD_PUSH_IMAGE }} tags: ${{ steps.meta.outputs.tags }} diff --git a/.github/workflows/docker-nginx.yml b/.github/workflows/docker-nginx.yml index dc10d24..ab506d0 100644 --- a/.github/workflows/docker-nginx.yml +++ b/.github/workflows/docker-nginx.yml @@ -48,7 +48,7 @@ jobs: id: build-and-push uses: docker/build-push-action@v6 with: - context: dns + context: ./nginx platforms: linux/amd64,linux/arm64 push: ${{ env.SHOULD_PUSH_IMAGE }} tags: ${{ steps.meta.outputs.tags }} From 590cd6835fe20b1d222e49e78b255be85851a189 Mon Sep 17 00:00:00 2001 From: mrjvs Date: Tue, 13 Aug 2024 21:12:33 +0200 Subject: [PATCH 2/3] checkout code manually --- .github/workflows/docker-dns.yml | 3 +++ .github/workflows/docker-nginx.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/docker-dns.yml b/.github/workflows/docker-dns.yml index a4b3f51..30f84a9 100644 --- a/.github/workflows/docker-dns.yml +++ b/.github/workflows/docker-dns.yml @@ -20,6 +20,9 @@ jobs: packages: write steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Set up QEMU for Docker uses: docker/setup-qemu-action@v3 diff --git a/.github/workflows/docker-nginx.yml b/.github/workflows/docker-nginx.yml index ab506d0..8562fc6 100644 --- a/.github/workflows/docker-nginx.yml +++ b/.github/workflows/docker-nginx.yml @@ -20,6 +20,9 @@ jobs: packages: write steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Set up QEMU for Docker uses: docker/setup-qemu-action@v3 From 12776e830f31bd3555eb84bc69ca3d6e4f9c62cc Mon Sep 17 00:00:00 2001 From: mrjvs Date: Tue, 13 Aug 2024 21:17:47 +0200 Subject: [PATCH 3/3] Add org prefix --- .github/workflows/docker-dns.yml | 2 +- .github/workflows/docker-nginx.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-dns.yml b/.github/workflows/docker-dns.yml index 30f84a9..0c512ef 100644 --- a/.github/workflows/docker-dns.yml +++ b/.github/workflows/docker-dns.yml @@ -7,7 +7,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: sssl-dns + IMAGE_NAME: ${{ github.repository_owner }}/sssl-dns jobs: build-publish: diff --git a/.github/workflows/docker-nginx.yml b/.github/workflows/docker-nginx.yml index 8562fc6..228db68 100644 --- a/.github/workflows/docker-nginx.yml +++ b/.github/workflows/docker-nginx.yml @@ -7,7 +7,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: sssl-nginx + IMAGE_NAME: ${{ github.repository_owner }}/sssl-nginx jobs: build-publish: