|
17 | 17 | required: false |
18 | 18 | type: string |
19 | 19 | registry: |
20 | | - description: "Docker registry to push built containers to, DOCKER_USERNAME and DOCKER_PASSWORD secrets must be set if not using GitHub Container Registry" |
| 20 | + description: "Docker registry to push built containers to, DOCKER_REGISTRY_USERNAME and DOCKER_REGISTRY_PASSWORD secrets must be set if not using GitHub Container Registry" |
21 | 21 | required: false |
22 | 22 | type: string |
23 | 23 | default: "ghcr.io" |
|
35 | 35 | type: string |
36 | 36 | default: ubuntu-latest |
37 | 37 | secrets: |
38 | | - DOCKER_USERNAME: |
| 38 | + DOCKER_REGISTRY_USERNAME: |
39 | 39 | description: "User name for Docker login, if not provided the GitHub actor will be used" |
40 | 40 | required: false |
41 | | - DOCKER_PASSWORD: |
| 41 | + DOCKER_REGISTRY_PASSWORD: |
42 | 42 | description: "Password or token for Docker login, if not provided the GITHUB_TOKEN will be used" |
43 | 43 | required: false |
44 | 44 |
|
|
71 | 71 | - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1 |
72 | 72 | - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 |
73 | 73 | env: |
74 | | - USERNAME: ${{ secrets.DOCKER_USERNAME || github.actor }} |
75 | | - PASSWORD: ${{ secrets.DOCKER_PASSWORD || secrets.GITHUB_TOKEN }} |
| 74 | + USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME || github.actor }} |
| 75 | + PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD || secrets.GITHUB_TOKEN }} |
76 | 76 | with: |
77 | 77 | registry: ${{ inputs.registry }} |
78 | 78 | username: ${{ env.USERNAME }} |
@@ -150,8 +150,8 @@ jobs: |
150 | 150 | - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1 |
151 | 151 | - uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0 |
152 | 152 | env: |
153 | | - USERNAME: ${{ secrets.DOCKER_USERNAME || github.actor }} |
154 | | - PASSWORD: ${{ secrets.DOCKER_PASSWORD || secrets.GITHUB_TOKEN }} |
| 153 | + USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME || github.actor }} |
| 154 | + PASSWORD: ${{ secrets.DOCKER_REGISTRY_PASSWORD || secrets.GITHUB_TOKEN }} |
155 | 155 | with: |
156 | 156 | registry: ${{ inputs.registry }} |
157 | 157 | username: ${{ env.USERNAME }} |
|
0 commit comments