mirror of
https://github.com/v2rayA/v2rayA.git
synced 2026-11-20 23:02:25 +03:00
chore: fix overwriting image when use matrix build and publish to dockerhub
This commit is contained in:
1 parent
9cb0d48c32
commit
bda905525b
2 files changed
+10
-19
No files matched your search
@@ -11,18 +11,12 @@ env:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
platform: [linux/arm, linux/arm64,linux/amd64]
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
PLATFORM: ${{ matrix.platform }}
|
||||
steps:
|
||||
- name: Get the version
|
||||
id: get_version
|
||||
run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v2 # https://github.com/docker/setup-qemu-action
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
- name: Set up Docker Buildx
|
||||
@@ -31,5 +25,5 @@ jobs:
|
||||
run: |
|
||||
docker login -u ${{secrets.DOCKER_USERNAME}} -p ${{secrets.DOCKER_PASSWORD}}
|
||||
v=$(echo ${{ steps.get_version.outputs.VERSION }} | cut -c2-)
|
||||
docker buildx build -t mzz2017/v2raya:$v -f Dockerfile --platform="$PLATFORM" . --push
|
||||
docker buildx build -t mzz2017/v2raya:latest -f Dockerfile --platform="$PLATFORM" . --push
|
||||
docker buildx build -t mzz2017/v2raya:$v -f Dockerfile --platform=linux/arm,linux/arm64,linux/amd64 . --push
|
||||
docker buildx build -t mzz2017/v2raya:latest -f Dockerfile --platform=linux/arm,linux/arm64,linux/amd64 . --push
|
||||
@@ -8,17 +8,15 @@ on:
|
||||
env:
|
||||
DOCKER_CLI_EXPERIMENTAL: enabled
|
||||
DOCKER_BUILDKIT: 1
|
||||
|
||||
jobs:
|
||||
build:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
platform: [linux/arm, linux/arm64,linux/amd64]
|
||||
runs-on: ubuntu-latest
|
||||
env:
|
||||
PLATFORM: ${{ matrix.platform }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Get the version
|
||||
id: get_version
|
||||
run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
|
||||
- uses: actions/checkout@v2 # https://github.com/docker/setup-qemu-action
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
- name: Set up Docker Buildx
|
||||
@@ -27,6 +25,5 @@ jobs:
|
||||
run: |
|
||||
docker login -u ${{secrets.DOCKER_USERNAME}} -p ${{secrets.DOCKER_PASSWORD}}
|
||||
v=$(git log --pretty=format:"%ad" --date=format:%Y%m%d $(git show -s --format=%H) -1)
|
||||
docker buildx build -t mzz2017/v2raya-nightly:$v -f Dockerfile.nightly --platform="$PLATFORM" . --push
|
||||
docker buildx build -t mzz2017/v2raya-nightly:latest -f Dockerfile.nightly --platform="$PLATFORM" . --push
|
||||
|
||||
docker buildx build -t mzz2017/v2raya-nightly:$v -f Dockerfile.nightly --platform=linux/arm,linux/arm64,linux/amd64 . --push
|
||||
docker buildx build -t mzz2017/v2raya-nightly:latest -f Dockerfile.nightly --platform=linux/arm,linux/arm64,linux/amd64 . --push
|
||||
Reference in new issue
Block a user