diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-07-09 12:19:54 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-07-09 12:19:54 +0200 |
| commit | 2497749715c987e32b74fd74e32ce55b5877d248 (patch) | |
| tree | 6259e7a1554bcff754a8ed7cf6cd0f395e874e91 /.github/workflows | |
| parent | fa17ae2098a25254cd9d58c93c90d79498f1bdbe (diff) | |
| parent | 358690d08b638d4319229e58858a50be76031971 (diff) | |
Merge branch 'develop' of github.com:JF002/Pinetime into develop
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/docker.yml | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 21617fe2..f81831ac 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -15,8 +15,6 @@ on: jobs: build: runs-on: ubuntu-latest - env: - USERNAME: infinitime steps: - uses: actions/checkout@v3 @@ -24,7 +22,7 @@ jobs: if: github.event_name == 'push' uses: docker/login-action@v2 with: - username: ${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }} + username: ${{ secrets.DOCKER_HUB_LOGIN_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Set up Docker metadata @@ -32,7 +30,7 @@ jobs: uses: docker/metadata-action@v4 with: images: | - ${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }}/infinitime-build + ${{ secrets.DOCKER_HUB_IMAGE_USERNAME }}/infinitime-build tags: | type=sha type=raw,value=latest @@ -55,8 +53,8 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }}/infinitime-build:buildcache - cache-to: type=registry,ref=${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }}/infinitime-build:buildcache,mode=max + cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME }}/infinitime-build:buildcache + cache-to: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME }}/infinitime-build:buildcache,mode=max - name: Build if: github.event_name != 'push' @@ -67,4 +65,4 @@ jobs: platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} push: false - cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_USERNAME || env.USERNAME }}/infinitime-build:buildcache + cache-from: type=registry,ref=${{ secrets.DOCKER_HUB_IMAGE_USERNAME }}/infinitime-build:buildcache |