|
6 | 6 | paths: |
7 | 7 | - 'ftl-build/**' |
8 | 8 | - '.github/workflows/ftl-build.yml' |
9 | | - - '.github/actions/**' |
10 | 9 | tags: |
11 | 10 | - '**' |
12 | 11 | # Only run on push events to the main repository (not from forks) |
@@ -71,14 +70,20 @@ jobs: |
71 | 70 | tags: | |
72 | 71 | type=ref,event=branch,enable=${{ github.event_name != 'schedule' }} |
73 | 72 | - |
74 | | - name: Login to DockerHub and GitHub Container Registry |
75 | | - if: github.event_name != 'pull_request' |
76 | | - uses: ./.github/actions/login-repo |
| 73 | + name: Login to Docker Hub |
| 74 | + uses: docker/login-action@v2 |
| 75 | + with: |
| 76 | + registry: docker.io |
| 77 | + username: ${{ secrets.DOCKERHUB_USER }} |
| 78 | + password: ${{ secrets.DOCKERHUB_PASS }} |
| 79 | + |
| 80 | + - |
| 81 | + name: Login to GitHub Container Registry |
| 82 | + uses: docker/login-action@v2 |
77 | 83 | with: |
78 | | - docker_username: ${{ secrets.DOCKERHUB_USER }} |
79 | | - docker_password: ${{ secrets.DOCKERHUB_PASS }} |
80 | | - ghcr_username: ${{ github.repository_owner }} |
81 | | - ghcr_password: ${{ secrets.GITHUB_TOKEN }} |
| 84 | + registry: ghcr.io |
| 85 | + username: ${{ github.repository_owner }} |
| 86 | + password: ${{ secrets.GITHUB_TOKEN }} |
82 | 87 | - |
83 | 88 | # Add support for more platforms with QEMU (optional) |
84 | 89 | # https://github.com/docker/setup-qemu-action |
@@ -153,13 +158,20 @@ jobs: |
153 | 158 | name: Set up Docker Buildx |
154 | 159 | uses: docker/setup-buildx-action@v3 |
155 | 160 | - |
156 | | - name: Login to DockerHub and GitHub Container Registry |
157 | | - uses: ./.github/actions/login-repo |
| 161 | + name: Login to Docker Hub |
| 162 | + uses: docker/login-action@v2 |
| 163 | + with: |
| 164 | + registry: docker.io |
| 165 | + username: ${{ secrets.DOCKERHUB_USER }} |
| 166 | + password: ${{ secrets.DOCKERHUB_PASS }} |
| 167 | + |
| 168 | + - |
| 169 | + name: Login to GitHub Container Registry |
| 170 | + uses: docker/login-action@v2 |
158 | 171 | with: |
159 | | - docker_username: ${{ secrets.DOCKERHUB_USER }} |
160 | | - docker_password: ${{ secrets.DOCKERHUB_PASS }} |
161 | | - ghcr_username: ${{ github.repository_owner }} |
162 | | - ghcr_password: ${{ secrets.GITHUB_TOKEN }} |
| 172 | + registry: ghcr.io |
| 173 | + username: ${{ github.repository_owner }} |
| 174 | + password: ${{ secrets.GITHUB_TOKEN }} |
163 | 175 | - |
164 | 176 | name: Docker meta |
165 | 177 | id: meta_docker |
|
0 commit comments