From 46ad84b76311d484a54a6db33745fd57a74dba95 Mon Sep 17 00:00:00 2001 From: dmunoz Date: Tue, 12 Nov 2024 17:08:34 +0100 Subject: [PATCH 1/7] grunt now comes preinstalled (actions ubuntu 22.04 and 24.04) --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7c2967ecf..9519e29c6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,6 @@ jobs: working-directory: ./src run: | npm ci - npm install grunt-cli -g grunt ci - name: Coveralls Parallel uses: coverallsapp/github-action@release/v2 From ec28f14917bd2b30c6c874f93f318b971ea41cdd Mon Sep 17 00:00:00 2001 From: dmunoz Date: Tue, 12 Nov 2024 17:09:02 +0100 Subject: [PATCH 2/7] Conditional dockerhub and quay.io push --- .github/workflows/docker_ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker_ci.yml b/.github/workflows/docker_ci.yml index 4627be789..50af9ec36 100644 --- a/.github/workflows/docker_ci.yml +++ b/.github/workflows/docker_ci.yml @@ -31,7 +31,10 @@ jobs: id: meta uses: docker/metadata-action@v5 with: - images: fiware/wirecloud, quay.io/fiware/wirecloud + images: | + ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN && 'fiware/wirecloud }}' || '' }} + ${{ env.QUAY_USERNAME && env.QUAY_TOKEN && 'quay.io/fiware/wirecloud' || '' }} + ghcr.io/${{ github.repository }} # https://github.com/docker/setup-qemu-action - name: Set up QEMU @@ -60,13 +63,13 @@ jobs: } - name: Login to DockerHub - if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' && env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io - if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' && env.QUAY_USERNAME && env.QUAY_TOKEN uses: docker/login-action@v3 with: registry: quay.io From 7030a8a594780abc84b9212348f639ba8dea8f47 Mon Sep 17 00:00:00 2001 From: dmunoz Date: Tue, 12 Nov 2024 17:25:49 +0100 Subject: [PATCH 3/7] change conditional logic --- .github/workflows/docker_ci.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker_ci.yml b/.github/workflows/docker_ci.yml index 50af9ec36..2084f9957 100644 --- a/.github/workflows/docker_ci.yml +++ b/.github/workflows/docker_ci.yml @@ -20,6 +20,9 @@ permissions: jobs: build: + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }} runs-on: ubuntu-latest steps: # Get the repository's code @@ -32,8 +35,8 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ${{ env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN && 'fiware/wirecloud }}' || '' }} - ${{ env.QUAY_USERNAME && env.QUAY_TOKEN && 'quay.io/fiware/wirecloud' || '' }} + ${{ env.DOCKERHUB_USERNAME && 'fiware/wirecloud ' || '' }} + ${{ env.QUAY_USERNAME && 'quay.io/fiware/wirecloud' || '' }} ghcr.io/${{ github.repository }} # https://github.com/docker/setup-qemu-action @@ -63,13 +66,13 @@ jobs: } - name: Login to DockerHub - if: github.event_name != 'pull_request' && env.DOCKERHUB_USERNAME && env.DOCKERHUB_TOKEN + if: github.event_name != 'pull_request' && env.DOCKERHUB_USERNAME uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to Quay.io - if: github.event_name != 'pull_request' && env.QUAY_USERNAME && env.QUAY_TOKEN + if: github.event_name != 'pull_request' && env.QUAY_USERNAME uses: docker/login-action@v3 with: registry: quay.io From ff2601a5f2e78c480f34fef7b764d73d972b09ca Mon Sep 17 00:00:00 2001 From: dmunoz Date: Tue, 12 Nov 2024 17:31:36 +0100 Subject: [PATCH 4/7] allow ghcr.io write access --- .github/workflows/docker_ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker_ci.yml b/.github/workflows/docker_ci.yml index 2084f9957..3732a5abb 100644 --- a/.github/workflows/docker_ci.yml +++ b/.github/workflows/docker_ci.yml @@ -17,6 +17,7 @@ on: permissions: contents: read + packages: write jobs: build: From e58a143c90046d20c1f14f301608f85bb9f0abe8 Mon Sep 17 00:00:00 2001 From: David <39565245+dmunozv04@users.noreply.github.com> Date: Mon, 6 Jan 2025 19:20:39 +0100 Subject: [PATCH 5/7] Remove trailing whitespace --- .github/workflows/docker_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_ci.yml b/.github/workflows/docker_ci.yml index 3732a5abb..ea091a089 100644 --- a/.github/workflows/docker_ci.yml +++ b/.github/workflows/docker_ci.yml @@ -36,7 +36,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ${{ env.DOCKERHUB_USERNAME && 'fiware/wirecloud ' || '' }} + ${{ env.DOCKERHUB_USERNAME && 'fiware/wirecloud' || '' }} ${{ env.QUAY_USERNAME && 'quay.io/fiware/wirecloud' || '' }} ghcr.io/${{ github.repository }} From 7348c2eb7aad0e34effbe27ecd9faf884d392915 Mon Sep 17 00:00:00 2001 From: David <39565245+dmunozv04@users.noreply.github.com> Date: Mon, 6 Jan 2025 22:29:33 +0100 Subject: [PATCH 6/7] Update docker_ci.yml Login to ghcr.io --- .github/workflows/docker_ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_ci.yml b/.github/workflows/docker_ci.yml index ea091a089..0f1fbcbd9 100644 --- a/.github/workflows/docker_ci.yml +++ b/.github/workflows/docker_ci.yml @@ -65,7 +65,13 @@ jobs: "var-cache-apt": "/var/cache/apt", "root-cache-pip": "/root/.cache/pip" } - + - name: Login to GHCR + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Login to DockerHub if: github.event_name != 'pull_request' && env.DOCKERHUB_USERNAME uses: docker/login-action@v3 @@ -112,4 +118,4 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha - cache-to: type=gha,mode=max \ No newline at end of file + cache-to: type=gha,mode=max From ff097d37ced5d11f2d1842bbc907953e0690e7b5 Mon Sep 17 00:00:00 2001 From: dmunoz Date: Tue, 7 Jan 2025 20:42:51 +0100 Subject: [PATCH 7/7] remove not needed CI permission --- .github/workflows/docker_ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker_ci.yml b/.github/workflows/docker_ci.yml index 0f1fbcbd9..ec32b4afd 100644 --- a/.github/workflows/docker_ci.yml +++ b/.github/workflows/docker_ci.yml @@ -17,7 +17,6 @@ on: permissions: contents: read - packages: write jobs: build: