diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a6c63a..b6f3763 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -53,6 +53,10 @@ jobs: dockerhub-build-push: needs: quality-checks runs-on: ubuntu-latest + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + DOCKERHUB_REPOSITORY: ${{ secrets.DOCKERHUB_REPOSITORY }} steps: - name: Get current date @@ -71,7 +75,7 @@ jobs: name: Prepare image tags id: image_tags env: - DOCKERHUB_REPOSITORY: ${{ secrets.DOCKERHUB_REPOSITORY }} + DOCKERHUB_REPOSITORY: ${{ env.DOCKERHUB_REPOSITORY }} GHCR_REPOSITORY: ${{ env.GHCR_REPOSITORY }} DATE: ${{ steps.date.outputs.date }} run: | @@ -88,10 +92,10 @@ jobs: - name: Login to DockerHub uses: docker/login-action@v4 - if: ${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }} + if: ${{ env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != '' }} with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ env.DOCKERHUB_USERNAME }} + password: ${{ env.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry uses: docker/login-action@v4 @@ -113,15 +117,20 @@ jobs: dockerhub-sync-readme: needs: dockerhub-build-push runs-on: ubuntu-latest - if: ${{ secrets.DOCKERHUB_USERNAME != '' && (secrets.DOCKERHUB_PASSWORD != '' || secrets.DOCKERHUB_TOKEN != '') && secrets.DOCKERHUB_REPOSITORY != '' }} + env: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + DOCKERHUB_REPOSITORY: ${{ secrets.DOCKERHUB_REPOSITORY }} + if: ${{ env.DOCKERHUB_USERNAME != '' && (env.DOCKERHUB_PASSWORD != '' || env.DOCKERHUB_TOKEN != '') && env.DOCKERHUB_REPOSITORY != '' }} steps: - name: Sync README uses: docker://lsiodev/readme-sync:latest env: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD != '' && secrets.DOCKERHUB_PASSWORD || secrets.DOCKERHUB_TOKEN }} + DOCKERHUB_USERNAME: ${{ env.DOCKERHUB_USERNAME }} + DOCKERHUB_PASSWORD: ${{ env.DOCKERHUB_PASSWORD != '' && env.DOCKERHUB_PASSWORD || env.DOCKERHUB_TOKEN }} GIT_REPOSITORY: ${{ github.repository }} - DOCKER_REPOSITORY: ${{ secrets.DOCKERHUB_REPOSITORY }} + DOCKER_REPOSITORY: ${{ env.DOCKERHUB_REPOSITORY }} GIT_BRANCH: master with: entrypoint: node