From a54a36ae18af9578f985a30d133463efe9e1da15 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 16 Mar 2023 10:50:26 +0100 Subject: [PATCH] updates --- .../pocketbase-release-dockerhub.yml | 93 +++++++++++++++++++ .github/workflows/pocketbase-release.yml | 58 +++++------- .github/workflows/production-release.yml | 32 +------ .github/workflows/release-candidate.yml | 39 +------- .github/workflows/staging-release.yml | 23 +++-- 5 files changed, 130 insertions(+), 115 deletions(-) create mode 100644 .github/workflows/pocketbase-release-dockerhub.yml diff --git a/.github/workflows/pocketbase-release-dockerhub.yml b/.github/workflows/pocketbase-release-dockerhub.yml new file mode 100644 index 000000000..02b8aa6dd --- /dev/null +++ b/.github/workflows/pocketbase-release-dockerhub.yml @@ -0,0 +1,93 @@ +name: pocketbase-release + +on: + push: + paths: + - "others/pocketbase/*" + - ".github/workflows/pocketbase-release.yml" + branches: + - next + - main +jobs: + arm64: + runs-on: [self-hosted, arm64] + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: others/pocketbase/ + platforms: linux/arm64 + push: true + tags: coollabsio/pocketbase:0.12.3-arm64 + amd64: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v3 + with: + context: others/pocketbase/ + platforms: linux/amd64 + push: true + tags: coollabsio/pocketbase:0.12.3-amd64 + aarch64: + runs-on: [self-hosted, arm64] + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: others/pocketbase/ + platforms: linux/aarch64 + push: true + tags: coollabsio/pocketbase:0.12.3-aarch64 + merge-manifest: + runs-on: ubuntu-latest + needs: [amd64, arm64, aarch64] + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Create & publish manifest + run: | + docker manifest create coollabsio/pocketbase:0.12.3 --amend coollabsio/pocketbase:0.12.3-amd64 --amend coollabsio/pocketbase:0.12.3-arm64 --amend coollabsio/pocketbase:0.12.3-aarch64 + docker manifest push coollabsio/pocketbase:0.12.3 diff --git a/.github/workflows/pocketbase-release.yml b/.github/workflows/pocketbase-release.yml index 02b8aa6dd..61a475820 100644 --- a/.github/workflows/pocketbase-release.yml +++ b/.github/workflows/pocketbase-release.yml @@ -8,28 +8,12 @@ on: branches: - next - main +env: + REGISTRY: ghcr.io + IMAGE_NAME: "coollabsio/pocketbase" + VERSION: "0.12.3" + jobs: - arm64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v2 - with: - context: others/pocketbase/ - platforms: linux/arm64 - push: true - tags: coollabsio/pocketbase:0.12.3-arm64 amd64: runs-on: ubuntu-latest steps: @@ -39,18 +23,19 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub + - name: Login to ghcr.io uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v3 with: context: others/pocketbase/ platforms: linux/amd64 push: true - tags: coollabsio/pocketbase:0.12.3-amd64 + tags: ${{ env.IMAGE_NAME }}:${{ env.VERSION }} aarch64: runs-on: [self-hosted, arm64] steps: @@ -60,21 +45,22 @@ jobs: uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Login to DockerHub - uses: docker/login-action@v1 + - name: Login to ghcr.io + uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push uses: docker/build-push-action@v2 with: context: others/pocketbase/ platforms: linux/aarch64 push: true - tags: coollabsio/pocketbase:0.12.3-aarch64 + tags: ${{ env.IMAGE_NAME }}:${{ env.VERSION }}-aarch64 merge-manifest: runs-on: ubuntu-latest - needs: [amd64, arm64, aarch64] + needs: [amd64, aarch64] steps: - name: Checkout uses: actions/checkout@v3 @@ -82,12 +68,12 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub + - name: Login to ghcr.io uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Create & publish manifest run: | - docker manifest create coollabsio/pocketbase:0.12.3 --amend coollabsio/pocketbase:0.12.3-amd64 --amend coollabsio/pocketbase:0.12.3-arm64 --amend coollabsio/pocketbase:0.12.3-aarch64 - docker manifest push coollabsio/pocketbase:0.12.3 + docker buildx imagetools create --amend ${{ env.IMAGE_NAME }}:${{ env.VERSION }}-aarch64 --tag ${{ env.IMAGE_NAME }}:${{ env.VERSION }} diff --git a/.github/workflows/production-release.yml b/.github/workflows/production-release.yml index c95724ce8..a519f8a47 100644 --- a/.github/workflows/production-release.yml +++ b/.github/workflows/production-release.yml @@ -9,34 +9,6 @@ env: IMAGE_NAME: "coollabsio/coolify" jobs: - arm64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata - id: meta - uses: docker/metadata-action@v4 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - - name: Build and push - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }}-arm64 - labels: ${{ steps.meta.outputs.labels }} amd64: runs-on: ubuntu-latest steps: @@ -95,7 +67,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} merge-manifest: runs-on: ubuntu-latest - needs: [amd64, arm64, aarch64] + needs: [amd64, aarch64] steps: - name: Checkout uses: actions/checkout@v3 @@ -116,7 +88,7 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Create & publish manifest run: | - docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-arm64 --append ${{ steps.meta.outputs.tags }}-aarch64 --tag ${{ steps.meta.outputs.tags }} + docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-aarch64 --tag ${{ steps.meta.outputs.tags }} - uses: sarisia/actions-status-discord@v1 if: always() with: diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 665dbdf92..ecb5dd1fc 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -42,41 +42,6 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - arm64: - runs-on: [self-hosted, arm64] - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - ref: "next" - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login to ghcr.io - uses: docker/login-action@v2 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata - id: meta - uses: docker/metadata-action@v4 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - tags: | - type=ref,event=branch - type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - - name: Build and push - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }}-arm64 - labels: ${{ steps.meta.outputs.labels }} aarch64: runs-on: [self-hosted, arm64] steps: @@ -112,7 +77,7 @@ jobs: labels: ${{ steps.meta.outputs.labels }} merge-manifest: runs-on: ubuntu-latest - needs: [amd64, arm64, aarch64] + needs: [amd64, aarch64] steps: - name: Checkout uses: actions/checkout@v3 @@ -138,7 +103,7 @@ jobs: type=semver,pattern={{major}}.{{minor}} - name: Create & publish manifest run: | - docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-arm64 --append ${{ steps.meta.outputs.tags }}-aarch64 --tag ${{ steps.meta.outputs.tags }} + docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-aarch64 --tag ${{ steps.meta.outputs.tags }} - uses: sarisia/actions-status-discord@v1 if: always() with: diff --git a/.github/workflows/staging-release.yml b/.github/workflows/staging-release.yml index e99d46343..5f0e38a5e 100644 --- a/.github/workflows/staging-release.yml +++ b/.github/workflows/staging-release.yml @@ -1,7 +1,6 @@ name: staging-release on: - pull_request: push: paths: - "**" @@ -27,13 +26,13 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub + - name: Login to ghcr.io uses: docker/login-action@v2 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker + - name: Extract metadata (tags, labels) id: meta uses: docker/metadata-action@v4 with: @@ -46,7 +45,7 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - arm64: + aarch64: runs-on: [self-hosted, arm64] steps: - name: Checkout @@ -57,13 +56,13 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub + - name: Login to ghcr.io uses: docker/login-action@v2 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker + - name: Extract metadata (tags, labels) id: meta uses: docker/metadata-action@v4 with: @@ -72,13 +71,13 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: linux/arm64 + platforms: linux/aarch64 push: true - tags: ${{ steps.meta.outputs.tags }}-arm64 + tags: ${{ steps.meta.outputs.tags }}-aarch64 labels: ${{ steps.meta.outputs.labels }} merge-manifest: runs-on: ubuntu-latest - needs: [amd64, arm64] + needs: [amd64, aarch64] steps: - name: Checkout uses: actions/checkout@v3 @@ -86,20 +85,20 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to DockerHub + - name: Login to ghcr.io uses: docker/login-action@v2 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker + - name: Extract metadata (tags, labels) id: meta uses: docker/metadata-action@v4 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Create & publish manifest run: | - docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-arm64 --tag ${{ steps.meta.outputs.tags }} + docker buildx imagetools create --append ${{ steps.meta.outputs.tags }}-aarch64 --tag ${{ steps.meta.outputs.tags }} - uses: sarisia/actions-status-discord@v1 if: always() with: