Merge pull request #660 from specklesystems/gergo/CIRewrite

unified build number in docker tagging

.circleci/build.sh

@@ -8,7 +8,9 @@ FOLDER="${FOLDER:-packages}"
 
 DOCKER_IMAGE_TAG=speckle/speckle-$SPECKLE_SERVER_PACKAGE
 
-IMAGE_VERSION_TAG=$(./.circleci/get_version.sh)
+# IMAGE_VERSION_TAG=$(./.circleci/get_version.sh)
+IMAGE_VERSION_TAG="${IMAGE_VERSION_TAG:-0}"
+echo $IMAGE_VERSION_TAG
 
 docker build --build-arg SPECKLE_SERVER_VERSION=$IMAGE_VERSION_TAG -t $DOCKER_IMAGE_TAG:latest . -f $FOLDER/$SPECKLE_SERVER_PACKAGE/Dockerfile
 
@@ -19,5 +21,4 @@ if [[ "$IMAGE_VERSION_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
 fi
 
 echo "$DOCKER_REG_PASS" | docker login -u "$DOCKER_REG_USER" --password-stdin $DOCKER_REG_URL
-docker image ls
 docker push -a $DOCKER_IMAGE_TAG

.circleci/config.yml

@@ -10,6 +10,7 @@ workflows:
     jobs:
       - test-server
       - lint
+      - get-version
 
       # - build-viewer:
       #     # built the npm package
@@ -38,18 +39,21 @@ workflows:
           requires:
             - lint
             - test-server
+            - get-version
 
       - docker-build-and-publish-frontend:
           context: *docker-hub-context
           filters: *filters-build
           requires:
             - lint
+            - get-version
 
       - docker-build-and-publish-webhooks:
           context: *docker-hub-context
           filters: *filters-build
           requires:
             - lint
+            - get-version
             - test-server
 
       - docker-build-and-publish-file-imports:
@@ -57,6 +61,7 @@ workflows:
           filters: *filters-build
           requires:
             - lint
+            - get-version
             - test-server
 
       - docker-build-and-publish-previews:
@@ -64,6 +69,7 @@ workflows:
           filters: *filters-build
           requires:
             - lint
+            - get-version
             - test-server
 
       - docker-build-and-publish-test-container:
@@ -71,6 +77,7 @@ workflows:
           filters: *filters-build
           requires:
             - lint
+            - get-version
             - test-server
 
       - publish-helm-chart:
@@ -78,6 +85,7 @@ workflows:
           requires:
             - lint
             - test-server
+            - get-version
             - docker-build-and-publish-server
             - docker-build-and-publish-frontend
             - docker-build-and-publish-webhooks
@@ -98,6 +106,24 @@ jobs:
       - checkout
       - run: node --version
 
+  get-version:
+    docker: *docker-image
+    working_directory: &work-dir /tmp/ci
+    steps:
+      - checkout
+      - run: pwd
+      - run: mkdir -p workspace
+      - run:
+          name: set version
+          command: |
+            echo "export IMAGE_VERSION_TAG=$(.circleci/get_version.sh)" >> workspace/env-vars
+      - run: cat workspace/env-vars >> $BASH_ENV
+      - run: echo $IMAGE_VERSION_TAG
+      - persist_to_workspace:
+          root: workspace
+          paths:
+              - env-vars
+
   test-server:
     docker:
       - image: cimg/node:lts
@@ -151,8 +177,12 @@ jobs:
 
   docker-build-and-publish: &docker-job
     docker: *docker-image
+    working_directory: *work-dir
     steps:
       - checkout
+      - attach_workspace:
+          at: /tmp/ci/workspace
+      - run: cat workspace/env-vars >> $BASH_ENV
       - setup_remote_docker:
           docker_layer_caching: true
       - run:
@@ -200,8 +230,12 @@ jobs:
 
   publish-helm-chart:
     docker: *docker-image
+    working_directory: *work-dir
     steps:
       - checkout
+      - attach_workspace:
+          at: /tmp/ci/workspace
+      - run: cat workspace/env-vars >> $BASH_ENV
       - add_ssh_keys:
           fingerprints:
             - '18:74:c4:b9:dc:66:b2:66:1d:81:56:0d:0a:87:9b:b1'

.circleci/publish_helm_chart.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-RELEASE_VERSION=$(./.circleci/get_version.sh)
+RELEASE_VERSION=${IMAGE_VERSION_TAG}
 
 echo "Releasing Helm Chart version $RELEASE_VERSION"