From 6a6f4f6f57be26e19f52213cab4117d293319fc2 Mon Sep 17 00:00:00 2001
From: Vlad Ungureanu <vvu@vdev.ro>
Date: Mon, 25 Sep 2017 20:28:01 -0700
Subject: [PATCH 1/3] Publish snapshot docker containers (#9)

---
 .circleci/config.yml      | 39 ++++++++++++++++++++++++++++++++-------
 scripts/publish_docker.sh | 10 ++++++++--
 2 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53c68e779..d6c43c3c8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,6 +61,13 @@ install-yarn: &install-yarn
       apt-get -y update
       apt-get -y install nodejs yarn
 
+setup-docker: &setup-docker
+  run:
+    name: Setup Docker
+    commands: |
+      - setup_remote_docker
+      - *install-docker-client
+
 version: 2
 jobs:
   build:
@@ -107,12 +114,21 @@ jobs:
       - run: git log `git describe --tags --abbrev=0`..HEAD --pretty="### %s%n%b%n" > /tmp/artifacts/changelog.md
       - *store-artifacts
 
-  publish:
+  publish-snapshot:
     <<: *darwin-linux-no-cgo
     steps:
       - checkout
-      - setup_remote_docker
-      - *install-docker-client
+      - *setup-docker
+      - attach_workspace:
+          at: /go/src/github.com/palantir/bulldozer
+      - *build-docker-image
+      - run: ./scripts/publish_docker.sh
+
+  publish-release:
+    <<: *darwin-linux-no-cgo
+    steps:
+      - checkout
+      - *setup-docker
       - run: ./godelw publish bintray --url https://api.bintray.com --subject palantir --repository releases --user "$BINTRAY_USERNAME" --password "$BINTRAY_PASSWORD" --publish --downloads-list bulldozer
       - run: sha256sum dist/*.tgz
       - attach_workspace:
@@ -128,15 +144,15 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - publish:
+      - changelog:
           requires:
             - build
           filters:
             tags:
-              only: /^[0-9]+(\.[0-9]+)+(-rc[0-9]+)?(-alpha[0-9]+)?$/
-            branches:
               ignore: /.*/
-      - changelog:
+            branches:
+              only: /^master$/
+      - publish-snapshot:
           requires:
             - build
           filters:
@@ -144,3 +160,12 @@ workflows:
               ignore: /.*/
             branches:
               only: /^master$/
+      - publish-release:
+          requires:
+            - build
+          filters:
+            tags:
+              only: /^[0-9]+(\.[0-9]+)+(-rc[0-9]+)?(-alpha[0-9]+)?$/
+            branches:
+              ignore: /.*/
+
diff --git a/scripts/publish_docker.sh b/scripts/publish_docker.sh
index 5458e86cd..0bae8f923 100755
--- a/scripts/publish_docker.sh
+++ b/scripts/publish_docker.sh
@@ -3,5 +3,11 @@
 set -eu
 
 docker login -u "${DOCKERHUB_USERNAME}" -p "${DOCKERHUB_PASSWORD}"
-docker tag palantirtechnologies/bulldozer palantirtechnologies/bulldozer:$(./godelw project-version)
-docker push palantirtechnologies/bulldozer
\ No newline at end of file
+
+if git describe --exact-match --tags HEAD; then
+    docker tag palantirtechnologies/bulldozer palantirtechnologies/bulldozer:$(./godelw project-version)
+    docker push palantirtechnologies/bulldozer:$(./godelw project-version)
+else
+    docker tag palantirtechnologies/bulldozer palantirtechnologies/bulldozer:snapshot
+    docker push palantirtechnologies/bulldozer:snapshot
+fi

From e0a6494cfb048f89f9b4a2a3db14fe2c6eab8b6b Mon Sep 17 00:00:00 2001
From: Vlad Ungureanu <vvu@vdev.ro>
Date: Mon, 25 Sep 2017 20:35:26 -0700
Subject: [PATCH 2/3] Fix circleci config (#10)

---
 .circleci/config.yml      | 2 +-
 scripts/publish_docker.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d6c43c3c8..8e013e507 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -64,7 +64,7 @@ install-yarn: &install-yarn
 setup-docker: &setup-docker
   run:
     name: Setup Docker
-    commands: |
+    command: |
       - setup_remote_docker
       - *install-docker-client
 
diff --git a/scripts/publish_docker.sh b/scripts/publish_docker.sh
index 0bae8f923..36dfb117e 100755
--- a/scripts/publish_docker.sh
+++ b/scripts/publish_docker.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -eu
+set -u
 
 docker login -u "${DOCKERHUB_USERNAME}" -p "${DOCKERHUB_PASSWORD}"
 

From 0a82ee03e4585f3ce1a46fb08a04afa157350231 Mon Sep 17 00:00:00 2001
From: Vlad Ungureanu <vvu@vdev.ro>
Date: Mon, 25 Sep 2017 20:44:06 -0700
Subject: [PATCH 3/3] Cannot use reference in command block (#11)

---
 .circleci/config.yml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8e013e507..efdd25ab7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,13 +61,6 @@ install-yarn: &install-yarn
       apt-get -y update
       apt-get -y install nodejs yarn
 
-setup-docker: &setup-docker
-  run:
-    name: Setup Docker
-    command: |
-      - setup_remote_docker
-      - *install-docker-client
-
 version: 2
 jobs:
   build:
@@ -118,7 +111,8 @@ jobs:
     <<: *darwin-linux-no-cgo
     steps:
       - checkout
-      - *setup-docker
+      - setup_remote_docker
+      - *install-docker-client
       - attach_workspace:
           at: /go/src/github.com/palantir/bulldozer
       - *build-docker-image
@@ -128,7 +122,8 @@ jobs:
     <<: *darwin-linux-no-cgo
     steps:
       - checkout
-      - *setup-docker
+      - setup_remote_docker
+      - *install-docker-client
       - run: ./godelw publish bintray --url https://api.bintray.com --subject palantir --repository releases --user "$BINTRAY_USERNAME" --password "$BINTRAY_PASSWORD" --publish --downloads-list bulldozer
       - run: sha256sum dist/*.tgz
       - attach_workspace:
@@ -168,4 +163,3 @@ workflows:
               only: /^[0-9]+(\.[0-9]+)+(-rc[0-9]+)?(-alpha[0-9]+)?$/
             branches:
               ignore: /.*/
-