From 528c7f0b9aa6dc3aef72db54864f3030a87799ba Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 13 Dec 2023 11:11:56 +0000 Subject: [PATCH 1/4] remove function not required --- .github/workflows/main.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cf73fc3..97cbdc6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,20 +33,12 @@ jobs: env: name: openmicroscopy/bio-formats-octave steps: - - name: Get prefix - id: getprefix - run: | - if [ ! -z ${{ env.name }} ]; then - echo "prefix=${{ env.name }}:" >> $GITHUB_OUTPUT - else - echo "prefix=${{ github.repository }}:" >> $GITHUB_OUTPUT - fi - name: Get other tags id: gettags - uses: jupyterhub/action-major-minor-tag-calculator@v1.1.0 + uses: jupyterhub/action-major-minor-tag-calculator@v3 with: githubToken: ${{ secrets.GITHUB_TOKEN }} - prefix: "${{ steps.getprefix.outputs.prefix }}" + prefix: "${{ env.name }}:" - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Login to DockerHub @@ -58,4 +50,4 @@ jobs: uses: docker/build-push-action@v2 with: tags: ${{ join(fromJson(steps.gettags.outputs.tags)) }} - push: true \ No newline at end of file + push: true From dc3b8aafc0b749e4ca7a95b2db1c336dc0b270bb Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 13 Dec 2023 11:13:32 +0000 Subject: [PATCH 2/4] remove badge (404) --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 76dbc25..768ac30 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ Bio-Formats Octave ================== -[![Docker build](https://img.shields.io/docker/build/openmicroscopy/bio-formats-octave.svg)](https://hub.docker.com/r/openmicroscopy/bio-formats-octave) [![Actions Status](https://github.com/ome/bio-formats-octave-docker/workflows/Build/badge.svg)](https://github.com/ome/bio-formats-octave-docker/actions) From 6f65d7bbebc9c39924e7086454e28c67ae485e35 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 13 Dec 2023 12:04:41 +0000 Subject: [PATCH 3/4] add metadata --- .github/workflows/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 97cbdc6..0c19ba3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,6 +39,11 @@ jobs: with: githubToken: ${{ secrets.GITHUB_TOKEN }} prefix: "${{ env.name }}:" + - name: Docker metadata + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.name }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Login to DockerHub From 9626c8b412f6748f00ce9c89c950815b9c0ac92f Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Wed, 13 Dec 2023 12:14:03 +0000 Subject: [PATCH 4/4] add label --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c19ba3..c083d80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,4 +55,5 @@ jobs: uses: docker/build-push-action@v2 with: tags: ${{ join(fromJson(steps.gettags.outputs.tags)) }} + labels: ${{ steps.meta.outputs.labels }} push: true