From 447262feac8a65d82b23950895e64da736bd6d2c Mon Sep 17 00:00:00 2001 From: Deon George Date: Sat, 12 Oct 2024 22:08:00 +1100 Subject: [PATCH] Change to gitea workflow --- .gitea/workflows/build_docker.yml | 11 +++++------ Dockerfile => docker/Dockerfile | 0 init-docker => docker/init-docker | 0 3 files changed, 5 insertions(+), 6 deletions(-) rename Dockerfile => docker/Dockerfile (100%) rename init-docker => docker/init-docker (100%) diff --git a/.gitea/workflows/build_docker.yml b/.gitea/workflows/build_docker.yml index fbb6b90..6d5855e 100644 --- a/.gitea/workflows/build_docker.yml +++ b/.gitea/workflows/build_docker.yml @@ -11,7 +11,7 @@ jobs: matrix: arch: - x86_64 - # arm64 + - arm64 name: Build Docker Image runs-on: docker-${{ matrix.arch }} @@ -33,8 +33,7 @@ jobs: ( dockerd --host=tcp://0.0.0.0:2375 --tls=false & ) && sleep 3 ## Some debugging info # docker info && docker version - env|sort - echo "PRT: ${{ secrets.PKG_WRITE_TOKEN }}" + # env|sort - name: Registry FQDN Setup id: registry @@ -56,7 +55,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: ./Dockerfile + file: docker/Dockerfile push: true tags: "${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSIONARCH }}" @@ -94,6 +93,6 @@ jobs: - name: Build Docker Manifest run: | docker manifest create ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }} \ - ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 - #${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-arm64 + ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-x86_64 \ + ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }}-arm64 docker manifest push --purge ${{ steps.registry.outputs.registry }}/${{ env.GITHUB_REPOSITORY }}:${{ env.VERSION }} diff --git a/Dockerfile b/docker/Dockerfile similarity index 100% rename from Dockerfile rename to docker/Dockerfile diff --git a/init-docker b/docker/init-docker similarity index 100% rename from init-docker rename to docker/init-docker