From 463303292f42c8b8de16f9926c9ed9bb9dfced38 Mon Sep 17 00:00:00 2001 From: Erisa A Date: Tue, 1 Oct 2024 19:43:25 +0100 Subject: [PATCH 1/5] actions: Use Ubicloud instead of self-hosted Makes use of managed Ubicloud runners for multi-platform builds rather than relying on self-hosted actions runners x86 and arm builds are built concurrently on sepatate runners and marged at the end. https://www.ubicloud.com/docs/github-actions-integration/quickstart --- .github/workflows/docker-push.yml | 43 ----------- .github/workflows/docker-test.yml | 35 --------- .github/workflows/docker.yml | 117 ++++++++++++++++++++++++++++++ 3 files changed, 117 insertions(+), 78 deletions(-) delete mode 100644 .github/workflows/docker-push.yml delete mode 100644 .github/workflows/docker-test.yml create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml deleted file mode 100644 index 11330e4..0000000 --- a/.github/workflows/docker-push.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Build and deploy Docker image(s) - -on: - push: - branches: - - main - -jobs: - docker-deploy: - runs-on: self-hosted - steps: - - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: 'recursive' - fetch-depth: 0 - persist-credentials: false - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: yuuki-discord - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push the application - uses: docker/build-push-action@v6 - with: - context: . - file: ./Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 - push: true - builder: builder - tags: | - yuukibot/yuukichan:latest - ghcr.io/yuuki-discord/yuuki-bot:latest diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml deleted file mode 100644 index eceefa2..0000000 --- a/.github/workflows/docker-test.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Docker test build - -on: - push: - branches: - - '**' # matches every branch - - '!main' # excludes main - - pull_request: - branches: - - '**' # matches every branch - - -jobs: - test-build-prod: - runs-on: self-hosted - steps: - - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: 'recursive' - fetch-depth: 0 - - - name: Build image - uses: docker/build-push-action@v6 - with: - context: . - builder: builder - file: ./Dockerfile - platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 - push: false - tags: | - yuukibot/yuukichan:latest - diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..4789e30 --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,117 @@ +name: Build + +on: + workflow_dispatch: + push: + branches: + - '*' + +env: + IMAGE_NAME: ghcr.io/yuuki-discord/yuuki-bot +jobs: + docker: + name: Docker ${{ matrix.platform }} + runs-on: ${{ matrix.runner }} + strategy: + fail-fast: false + matrix: + include: + - runner: ubicloud-standard-2 + platform: linux/amd64 + - runner: ubicloud-standard-2-arm + platform: linux/arm64,linux/arm/v6,linux/arm/v7 + + steps: + - name: Check out code + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - + name: Login to GitHub Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.PAT }} + + - name: Extract metadata for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.IMAGE_NAME }} + tags: | + type=sha,prefix= + type=ref,event=branch + type=raw,value=latest,enable={{is_default_branch}} + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + + - name: Build and push by digest + id: build + uses: docker/build-push-action@v5 + if: github.ref == 'refs/heads/master' + with: + context: . + platforms: ${{ matrix.platform }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha,scope=ubicloud-${{ matrix.runner }} + cache-to: type=gha,mode=max,scope=ubicloud-${{ matrix.runner }} + outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest={{is_default_branch}},name-canonical={{is_default_branch}},push={{is_default_branch}} + provenance: false + + - name: Export digest + if: github.ref == 'refs/heads/master' + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: Upload digest + if: github.ref == 'refs/heads/master' + uses: actions/upload-artifact@v4 + with: + name: digests-${{ matrix.runner }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + merge: + if: github.ref == 'refs/heads/master' + runs-on: ubicloud + needs: + - docker + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + pattern: digests-* + merge-multiple: true + path: /tmp/digests + - + name: Login to GitHub Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.PAT }} + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.IMAGE_NAME }} + tags: | + type=sha,prefix= + type=ref,event=branch + type=raw,value=latest,enable={{is_default_branch}} + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + - name: Create manifest list and push + working-directory: /tmp/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ env.IMAGE_NAME }}@sha256:%s ' *) + - name: Inspect image + run: | + docker buildx imagetools inspect ${{ env.IMAGE_NAME }}:${{ steps.meta.outputs.version }} \ No newline at end of file From 2307f5c9260baa60f2660bfcb5c5bb2c804527db Mon Sep 17 00:00:00 2001 From: Erisa A Date: Tue, 1 Oct 2024 19:47:46 +0100 Subject: [PATCH 2/5] run on pull request too --- .github/workflows/docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 4789e30..983d9ab 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -5,6 +5,9 @@ on: push: branches: - '*' + pull_request: + branches: + - '**' # matches every branch env: IMAGE_NAME: ghcr.io/yuuki-discord/yuuki-bot From 1b07590d90d99918b60a45c56be33a47eddf6a69 Mon Sep 17 00:00:00 2001 From: Erisa A Date: Tue, 1 Oct 2024 19:49:57 +0100 Subject: [PATCH 3/5] Update github registry login --- .github/workflows/docker.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 983d9ab..cd336a6 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -31,13 +31,14 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - - name: Login to GitHub Registry + - + name: Login to GitHub Container Registry + if: github.ref == 'refs/heads/master' uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{ github.repository_owner }} - password: ${{ secrets.PAT }} + username: yuuki-discord + password: ${{ secrets.GITHUB_TOKEN }} - name: Extract metadata for Docker id: meta From fe885bd2ce1b8440abb01cfc756d37bb725481a6 Mon Sep 17 00:00:00 2001 From: Erisa A Date: Tue, 1 Oct 2024 19:50:52 +0100 Subject: [PATCH 4/5] actually run the docker build --- .github/workflows/docker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index cd336a6..1b59e7c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -55,7 +55,6 @@ jobs: - name: Build and push by digest id: build uses: docker/build-push-action@v5 - if: github.ref == 'refs/heads/master' with: context: . platforms: ${{ matrix.platform }} From 936b67f3457134fe2453ca349e46b87ac49e1365 Mon Sep 17 00:00:00 2001 From: Erisa A Date: Tue, 1 Oct 2024 20:03:00 +0100 Subject: [PATCH 5/5] try using bash to check default branch --- .github/workflows/docker.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 1b59e7c..6675817 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -27,6 +27,14 @@ jobs: steps: - name: Check out code uses: actions/checkout@v4 + + - name: Set default branch variable + run : | + if [[ $GITHUB_REF_NAME == 'main' ]]; then + echo "IS_MAIN_BRANCH=true" >> "$GITHUB_ENV" + else + echo "IS_MAIN_BRANCH=false" >> "$GITHUB_ENV" + fi - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -61,7 +69,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha,scope=ubicloud-${{ matrix.runner }} cache-to: type=gha,mode=max,scope=ubicloud-${{ matrix.runner }} - outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest={{is_default_branch}},name-canonical={{is_default_branch}},push={{is_default_branch}} + outputs: type=image,name=${{ env.IMAGE_NAME }},push-by-digest=${{env.IS_MAIN_BRANCH}},name-canonical=${{env.IS_MAIN_BRANCH}},push=${{env.IS_MAIN_BRANCH}} provenance: false - name: Export digest