fix tags

king-usr · Mar 25, 2020 · e34c33b · e34c33b
1 parent cb1ad79
commit e34c33b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
@@ -30,9 +30,10 @@ jobs:
                mkdir -p $GOPATH/src/v2ray.com/core
                pushd $GOPATH/src/v2ray.com/core
                git clone --progress https://github.com/v2fly/v2ray-core.git .
-               bash $REPO/ci-package.sh nosource noconf codename=$(cat ReleaseTag) buildname=docker-fly-amd64 abpathtgz=$REPO/v2ray-amd64.tgz 
-               bash $REPO/ci-package.sh nosource noconf codename=$(cat ReleaseTag) buildname=docker-fly-arm64 arm64 abpathtgz=$REPO/v2ray-arm64.tgz 
-               bash $REPO/ci-package.sh nosource noconf codename=$(cat ReleaseTag) buildname=docker-fly-armv7 arm7 abpathtgz=$REPO/v2ray-armv7.tgz 
+               HASH=$(git rev-parse --short HEAD)
+               bash $REPO/ci-package.sh nosource noconf codename=v2fly-${HASH} buildname=dockerfly-amd64 abpathtgz=$REPO/v2ray-amd64.tgz 
+               bash $REPO/ci-package.sh nosource noconf codename=v2fly-${HASH} buildname=dockerfly-arm64 arm64 abpathtgz=$REPO/v2ray-arm64.tgz 
+               bash $REPO/ci-package.sh nosource noconf codename=v2fly-${HASH} buildname=dockerfly-armv7 arm7 abpathtgz=$REPO/v2ray-armv7.tgz 
 
         -
             name: Dockerhub login

diff --git a/.github/workflows/docker-tag.yml b/.github/workflows/docker-tag.yml
@@ -60,5 +60,5 @@ jobs:
                 --platform=linux/amd64,linux/arm/v7,linux/arm64 \
                 --output "type=image,push=true" \
                 --file ./Dockerfile.X . \
-                --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/v2fly-core:${TAG}
+                --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/v2fly-core:${GITTAG}