From 878dffa50a90f098a7293126b4c689268a75d7fb Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:19:07 +0100 Subject: [PATCH 01/13] CI --- .github/workflows/build-matrix.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml index 3de21f8..39d6b36 100644 --- a/.github/workflows/build-matrix.yml +++ b/.github/workflows/build-matrix.yml @@ -5,14 +5,14 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest permissions: contents: write strategy: fail-fast: false matrix: platform: - - linux/amd64 + # - linux/amd64 - linux/arm64 steps: @@ -24,19 +24,19 @@ jobs: - name: Check out code uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Build and push by digest + name: Build id: build uses: docker/build-push-action@v5 with: context: . platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true + outputs: type=image,name=${{ env.REGISTRY_IMAGE }},name-canonical=true,push=false From 2d3d7aeb53a8ff391073090132ac6e89aa2829e5 Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:22:33 +0100 Subject: [PATCH 02/13] CI --- run.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/run.sh b/run.sh index abad2fa..8f2b4bc 100755 --- a/run.sh +++ b/run.sh @@ -2,11 +2,13 @@ set -e # Define the GitHub token to get rid of binstall warning to rule this out as cause for error -GITHUB_TOKEN=$(gh auth token) - -# Build the Docker image, passing the GitHub token as a build argument -docker buildx build . --progress=plain --build-arg GITHUB_TOKEN="$GITHUB_TOKEN" - +if GITHUB_TOKEN=$(gh auth token); then + # Build the Docker image, passing the GitHub token as a build argument + docker buildx build . --progress=plain --build-arg GITHUB_TOKEN="$GITHUB_TOKEN" +else + # Build the Docker image without the GitHub token + docker buildx build . --progress=plain +fi # Build for amd64 - works #docker build --platform linux/amd64 . From da70a622e17d1e3d97e09e73c8d8fffb1d63c424 Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:28:52 +0100 Subject: [PATCH 03/13] CI --- .github/workflows/build-matrix.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml index 39d6b36..d7c2705 100644 --- a/.github/workflows/build-matrix.yml +++ b/.github/workflows/build-matrix.yml @@ -16,16 +16,26 @@ jobs: - linux/arm64 steps: - - - name: Prepare + - name: Prepare run: | platform=${{ matrix.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Check out code uses: actions/checkout@v3 # - name: Set up QEMU # uses: docker/setup-qemu-action@v3 + - + name: Set up Docker + uses: crazy-max/ghaction-setup-docker@v3 + + - name: Login to DockerHub + uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 3b43cd829809b93bbaab4d912d722573e73be75a Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:30:16 +0100 Subject: [PATCH 04/13] ci --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 133bd93..d3202cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,14 +5,12 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: macos-latest permissions: contents: write steps: - name: Check out code - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + uses: actions/checkout@v3 - name: Build Docker image (manual) run: ./run.sh - name: Set up Docker Buildx From 90af4d3ed541f3a08b528550daafad7330c06eb0 Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:30:50 +0100 Subject: [PATCH 05/13] CI --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d3202cb..86bd42b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: steps: - name: Check out code uses: actions/checkout@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 - name: Build Docker image (manual) run: ./run.sh - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 \ No newline at end of file From 5eefb9aca142dd9608326c79fcb4c4c3dfb707a0 Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:33:19 +0100 Subject: [PATCH 06/13] ci --- .github/workflows/build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 86bd42b..bd3f08e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: Docker Build +name: run.sh on: push @@ -10,8 +10,6 @@ jobs: contents: write steps: - name: Check out code - uses: actions/checkout@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: actions/checkout@v3 - name: Build Docker image (manual) run: ./run.sh From 04387c1ededc71f0b64aed63fe40088814b4b8ce Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:35:04 +0100 Subject: [PATCH 07/13] CI --- .github/workflows/build-matrix.yml | 2 +- .github/workflows/build.yml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml index d7c2705..df880f5 100644 --- a/.github/workflows/build-matrix.yml +++ b/.github/workflows/build-matrix.yml @@ -1,4 +1,4 @@ -name: Docker Build +name: Buildx Action on: push diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bd3f08e..58cc076 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,10 @@ jobs: contents: write steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v3 + + - + name: Set up Docker + uses: crazy-max/ghaction-setup-docker@v3 - name: Build Docker image (manual) run: ./run.sh From 37cba8726be7840dc2908a2f75db21d200967c32 Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:39:43 +0100 Subject: [PATCH 08/13] CI --- .github/workflows/build-matrix.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml index df880f5..7d3c3d6 100644 --- a/.github/workflows/build-matrix.yml +++ b/.github/workflows/build-matrix.yml @@ -11,10 +11,8 @@ jobs: strategy: fail-fast: false matrix: - platform: - # - linux/amd64 - - linux/arm64 - + os: + - macos-latest # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs steps: - name: Prepare run: | From a333015e0f5650a7450dbf0bcd449b18e50f3f2d Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:49:15 +0100 Subject: [PATCH 09/13] CI --- run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run.sh b/run.sh index 8f2b4bc..0663b24 100755 --- a/run.sh +++ b/run.sh @@ -4,10 +4,10 @@ set -e # Define the GitHub token to get rid of binstall warning to rule this out as cause for error if GITHUB_TOKEN=$(gh auth token); then # Build the Docker image, passing the GitHub token as a build argument - docker buildx build . --progress=plain --build-arg GITHUB_TOKEN="$GITHUB_TOKEN" + docker buildx build . --build-arg GITHUB_TOKEN="$GITHUB_TOKEN" else # Build the Docker image without the GitHub token - docker buildx build . --progress=plain + docker buildx build . fi # Build for amd64 - works #docker build --platform linux/amd64 . From 765fd65f8d5426a56788b9c1020a32977a98fef1 Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:54:38 +0100 Subject: [PATCH 10/13] CI --- .github/workflows/build-matrix.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml index 7d3c3d6..d83e333 100644 --- a/.github/workflows/build-matrix.yml +++ b/.github/workflows/build-matrix.yml @@ -8,11 +8,14 @@ jobs: runs-on: macos-latest permissions: contents: write - strategy: - fail-fast: false - matrix: - os: - - macos-latest # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs + # strategy: + # fail-fast: false + # matrix: + # # os: + # # - macos-latest # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs + # platform: + # - linux/arm64 + steps: - name: Prepare run: | From 34dcd061a88367869bec5d526c14a15fff445e64 Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:56:36 +0100 Subject: [PATCH 11/13] containerd --- .github/workflows/build-matrix.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml index d83e333..076bdbb 100644 --- a/.github/workflows/build-matrix.yml +++ b/.github/workflows/build-matrix.yml @@ -30,7 +30,8 @@ jobs: # uses: docker/setup-qemu-action@v3 - name: Set up Docker - uses: crazy-max/ghaction-setup-docker@v3 + # uses: crazy-max/ghaction-setup-docker@v3 + uses: crazy-max/ghaction-setup-containerd@v3 - name: Login to DockerHub uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a From 9d0d5d6b8cdbc17138e00968ac1a6ae18a93a7c1 Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 14:57:09 +0100 Subject: [PATCH 12/13] containerd --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 58cc076..fbf378c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,8 @@ jobs: - name: Set up Docker - uses: crazy-max/ghaction-setup-docker@v3 + # uses: crazy-max/ghaction-setup-docker@v3 + uses: crazy-max/ghaction-setup-containerd@v3 + - name: Build Docker image (manual) run: ./run.sh From 4a4fded7b746a2cb4104312ac1570d22c0b9aa3d Mon Sep 17 00:00:00 2001 From: wasabrot <28702988+wasabrot@users.noreply.github.com> Date: Mon, 4 Mar 2024 15:01:57 +0100 Subject: [PATCH 13/13] CI --- .github/workflows/build-matrix.yml | 16 ++++++++-------- .github/workflows/build.yml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml index 076bdbb..3a553eb 100644 --- a/.github/workflows/build-matrix.yml +++ b/.github/workflows/build-matrix.yml @@ -17,10 +17,10 @@ jobs: # - linux/arm64 steps: - - name: Prepare - run: | - platform=${{ matrix.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + # - name: Prepare + # run: | + # platform=${{ matrix.platform }} + # echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - name: Check out code @@ -30,8 +30,8 @@ jobs: # uses: docker/setup-qemu-action@v3 - name: Set up Docker - # uses: crazy-max/ghaction-setup-docker@v3 - uses: crazy-max/ghaction-setup-containerd@v3 + uses: crazy-max/ghaction-setup-docker@v3 + # uses: crazy-max/ghaction-setup-containerd@v3 - name: Login to DockerHub uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a @@ -48,7 +48,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - platforms: ${{ matrix.platform }} - labels: ${{ steps.meta.outputs.labels }} + # platforms: ${{ matrix.platform }} + # labels: ${{ steps.meta.outputs.labels }} outputs: type=image,name=${{ env.REGISTRY_IMAGE }},name-canonical=true,push=false diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fbf378c..fc768a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,8 +14,8 @@ jobs: - name: Set up Docker - # uses: crazy-max/ghaction-setup-docker@v3 - uses: crazy-max/ghaction-setup-containerd@v3 + uses: crazy-max/ghaction-setup-docker@v3 + # uses: crazy-max/ghaction-setup-containerd@v3 - name: Build Docker image (manual) run: ./run.sh