Browse Source

[fix] DOCKERHUB_USERNAME env reference (#4778)

When making the container rework, I unknowingly deleted the section where an env with the same name as the secret was defined on the job scope, making it look like it was originally defined as an organization env.

Since we can't validate the secrets in a condition directly, it's better to let docker/login-action take care of failing the entire job if the credentials are invalid.

Reported in: https://github.com/searxng/searxng/issues/4777
Ivan Gabaldon 3 weeks ago
parent
commit
5d99373bc6
1 changed files with 5 additions and 9 deletions
  1. 5 9
      .github/workflows/container.yml

+ 5 - 9
.github/workflows/container.yml

@@ -153,30 +153,26 @@ jobs:
       - test
       - test
 
 
     steps:
     steps:
-      - if: env.DOCKERHUB_USERNAME != null
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v4
         uses: actions/checkout@v4
         with:
         with:
           persist-credentials: "false"
           persist-credentials: "false"
 
 
-      - if: env.DOCKERHUB_USERNAME != null
-        name: Login to GHCR
+      - name: Login to GHCR
         uses: docker/login-action@v3
         uses: docker/login-action@v3
         with:
         with:
           registry: "ghcr.io"
           registry: "ghcr.io"
           username: "${{ github.repository_owner }}"
           username: "${{ github.repository_owner }}"
           password: "${{ secrets.GITHUB_TOKEN }}"
           password: "${{ secrets.GITHUB_TOKEN }}"
 
 
-      - if: env.DOCKERHUB_USERNAME != null
-        name: Login to Docker Hub
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         uses: docker/login-action@v3
         with:
         with:
           registry: "docker.io"
           registry: "docker.io"
-          username: "${{ env.DOCKERHUB_USERNAME }}"
+          username: "${{ secrets.DOCKERHUB_USERNAME }}"
           password: "${{ secrets.DOCKERHUB_TOKEN }}"
           password: "${{ secrets.DOCKERHUB_TOKEN }}"
 
 
-      - if: env.DOCKERHUB_USERNAME != null
-        name: Release
+      - name: Release
         env:
         env:
           GIT_URL: "${{ needs.build.outputs.git_url }}"
           GIT_URL: "${{ needs.build.outputs.git_url }}"
           DOCKER_TAG: "${{ needs.build.outputs.docker_tag }}"
           DOCKER_TAG: "${{ needs.build.outputs.docker_tag }}"