Merge branch 'develop' of github.com:JF002/Pinetime into develop
This commit is contained in:
commit
2497749715
12
.github/workflows/docker.yml
vendored
12
.github/workflows/docker.yml
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user