From 00bc06be127f57d35c17e583944fc7e312817f9e Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 12 Sep 2022 09:24:52 +0100 Subject: [PATCH 1/2] Improve visual distinction of steps in workflows --- .github/workflows/master.yml | 17 ++++++++++++++++- .github/workflows/pr.yml | 8 ++++++++ .github/workflows/release.yml | 21 ++++++++++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 558ebe31..2705418d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -11,14 +11,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Set up CI Image Metadata id: docker_meta_ci uses: crazy-max/ghaction-docker-meta@v1 with: images: solidnerd/bookstack-dev tag-sha: true + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Build Image uses: docker/build-push-action@v3 with: @@ -31,33 +34,39 @@ jobs: labels: ${{ steps.docker_meta_ci.outputs.labels }} cache-from: type=registry,ref=solidnerd/bookstack-dev:master outputs: type=docker,dest=/tmp/image-bookstack.tar + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: image-bookstack-master path: /tmp/image-bookstack.tar if-no-files-found: warn + e2e: runs-on: ubuntu-latest needs: build steps: - name: Checkout uses: actions/checkout@v3 + - name: Download artifact uses: actions/download-artifact@v3 with: name: image-bookstack-master path: /tmp + - name: Load Docker image run: | docker load --input /tmp/image-bookstack.tar docker image ls -a + push: runs-on: ubuntu-20.04 needs: e2e steps: - name: Checkout uses: actions/checkout@v3 + - name: Set up Docker Hub Image Metadata id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 @@ -67,6 +76,7 @@ jobs: {{version}} {{major}}.{{minor}} {{major}}.{{minor}}.{{patch}} + - name: Download artifact uses: actions/download-artifact@v3 with: @@ -77,22 +87,27 @@ jobs: run: | docker load --input /tmp/image-bookstack.tar docker image ls -a + - 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 if: github.event_name != 'pull_request' uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.CR_PAT }} + - name: Build and Push uses: docker/build-push-action@v3 with: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2af1a9d7..a44fa8e8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -11,14 +11,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Docker meta ci id: docker_meta_ci uses: crazy-max/ghaction-docker-meta@v1 with: images: solidnerd/bookstack-dev tag-sha: true + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Build and push Dev uses: docker/build-push-action@v3 with: @@ -32,27 +35,32 @@ jobs: cache-from: type=registry,ref=solidnerd/bookstack-dev:master cache-to: type=inline outputs: type=docker,dest=/tmp/image-bookstack.tar + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: image-bookstack path: /tmp/image-bookstack.tar if-no-files-found: warn + e2e: runs-on: ubuntu-latest needs: build steps: - name: Checkout uses: actions/checkout@v3 + - name: Download artifact uses: actions/download-artifact@v3 with: name: image-bookstack path: /tmp if-no-files-found: warn + - name: Load Docker image run: | docker load --input /tmp/image-bookstack.tar docker image ls -a + - name: Execute End-to-End Test run: make e2e diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9138fede..dd8b182a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,14 +11,17 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Set up CI Image Metadata id: docker_meta_ci uses: crazy-max/ghaction-docker-meta@v1 with: images: solidnerd/bookstack-dev tag-sha: true + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Build and push Dev uses: docker/build-push-action@v3 with: @@ -31,32 +34,38 @@ jobs: labels: ${{ steps.docker_meta_ci.outputs.labels }} cache-from: type=registry,ref=solidnerd/bookstack-dev:master outputs: type=docker,dest=/tmp/image-bookstack.tar + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: image-bookstack-master path: /tmp/image-bookstack.tar + e2e: runs-on: ubuntu-latest needs: build steps: - name: Checkout uses: actions/checkout@v3 + - name: Download artifact uses: actions/download-artifact@v3 with: name: image-bookstack-master path: /tmp + - name: Load Docker image run: | docker load --input /tmp/image-bookstack.tar docker image ls -a + push: runs-on: ubuntu-20.04 needs: e2e steps: - name: Checkout uses: actions/checkout@v3 + - name: Set up Docker Hub Image Metadata id: docker_meta uses: crazy-max/ghaction-docker-meta@v1 @@ -66,31 +75,38 @@ jobs: {{version}} {{major}}.{{minor}} {{major}}.{{minor}}.{{patch}} + - name: Download artifact uses: actions/download-artifact@v3 with: name: image-bookstack-master path: /tmp + - name: Load Docker image run: | docker load --input /tmp/image-bookstack.tar docker image ls -a + - 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 if: github.event_name != 'pull_request' uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.CR_PAT }} + - name: Build and Push master uses: docker/build-push-action@v3 with: @@ -103,6 +119,7 @@ jobs: labels: ${{ steps.docker_meta.outputs.labels }} cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }} cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }} + create-release: runs-on: ubuntu-20.04 needs: push @@ -110,11 +127,13 @@ jobs: # To use this repository's private action, you must check out the repository - name: Checkout uses: actions/checkout@v3 + - name: Generate changelog id: changelog uses: metcalfc/changelog-generator@v3.0.0 with: myToken: ${{ secrets.GITHUB_TOKEN }} + - name: Create Release id: create_release uses: actions/create-release@v1.1.4 From 3bf1eb1ace3f17d79777705ef6b05b12c2abec18 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 12 Sep 2022 09:32:13 +0100 Subject: [PATCH 2/2] Update to metadata-action v4 See update guide here: https://github.com/docker/metadata-action/blob/master/UPGRADE.md --- .github/workflows/master.yml | 15 ++++++++------- .github/workflows/pr.yml | 5 +++-- .github/workflows/release.yml | 15 ++++++++------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 2705418d..b00bd691 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,10 +14,11 @@ jobs: - name: Set up CI Image Metadata id: docker_meta_ci - uses: crazy-max/ghaction-docker-meta@v1 + uses: docker/metadata-action@v4 with: images: solidnerd/bookstack-dev - tag-sha: true + tags: | + type=sha - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -69,13 +70,13 @@ jobs: - name: Set up Docker Hub Image Metadata id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 + uses: docker/metadata-action@v4 with: images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack - tag-semver: | - {{version}} - {{major}}.{{minor}} - {{major}}.{{minor}}.{{patch}} + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}}.{{minor}}.{{patch}} - name: Download artifact uses: actions/download-artifact@v3 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a44fa8e8..f774e944 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,10 +14,11 @@ jobs: - name: Docker meta ci id: docker_meta_ci - uses: crazy-max/ghaction-docker-meta@v1 + uses: docker/metadata-action@v4 with: images: solidnerd/bookstack-dev - tag-sha: true + tags: | + type=sha - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd8b182a..a281d8ca 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,10 +14,11 @@ jobs: - name: Set up CI Image Metadata id: docker_meta_ci - uses: crazy-max/ghaction-docker-meta@v1 + uses: docker/metadata-action@v4 with: images: solidnerd/bookstack-dev - tag-sha: true + tags: | + type=sha - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -68,13 +69,13 @@ jobs: - name: Set up Docker Hub Image Metadata id: docker_meta - uses: crazy-max/ghaction-docker-meta@v1 + uses: docker/metadata-action@v4 with: images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack - tag-semver: | - {{version}} - {{major}}.{{minor}} - {{major}}.{{minor}}.{{patch}} + tags: + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}}.{{minor}}.{{patch}} - name: Download artifact uses: actions/download-artifact@v3