瀏覽代碼

Revert "CI: Don't rely on CIRCLE_TAG variable"

This reverts commit 39909e1af0b315974b4201412b2cb1dcaa9684ed.

The variable *does* work if it's triggered correctly.
Danilo Bargen 6 年之前
父節點
當前提交
ca71483aeb
共有 1 個文件被更改,包括 3 次插入4 次删除
  1. 3 4
      .circleci/config.yml

+ 3 - 4
.circleci/config.yml

@@ -85,10 +85,9 @@ jobs:
       - checkout
       - setup_remote_docker
       - run: >
-          export tag=$(git describe --tags --abbrev=0)
-                 minortag=$(echo $tag | sed 's/^\(v[0-9]*\.[0-9]*\)\..*$/\1/')
-                 majortag=$(echo $tag | sed 's/^\(v[0-9]*\)\..*$/\1/')
-          docker build .  --no-cache -t $IMAGE:$tag -t $IMAGE:$minortag -t $IMAGE:$majortag
+          export minortag=$(echo $CIRCLE_TAG | sed 's/^\(v[0-9]*\.[0-9]*\)\..*$/\1/')
+                 majortag=$(echo $CIRCLE_TAG | sed 's/^\(v[0-9]*\)\..*$/\1/')
+          docker build .  --no-cache -t $IMAGE:$CIRCLE_TAG -t $IMAGE:$minortag -t $IMAGE:$majortag
           && docker login -u $DOCKER_USER -p $DOCKER_API_KEY
           && docker push $IMAGE
   docker-rebuild-images: