From f3deca41d72b1c7943c07069b38d649ee09ef348 Mon Sep 17 00:00:00 2001
From: Rahul De <rahul080327@gmail.com>
Date: Sun, 3 Jan 2021 15:47:00 +0100
Subject: [PATCH] [#699] Test alpine builds

---
 .circleci/config.yml    |  8 --------
 .circleci/script/docker | 16 ++++++----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4e45fab3..7cc5e1dd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -160,14 +160,6 @@ jobs:
           command: |
             git submodule init
             git submodule update
-      - run:
-          name: "Short circuit on SNAPSHOT"
-          command: |
-            VERSION=$(cat resources/BABASHKA_VERSION)
-            if [[ "$VERSION" == *-SNAPSHOT ]]
-            then
-              circleci task halt
-            fi
       - restore_cache:
           keys:
             - linux-{{ checksum "project.clj" }}-{{ checksum ".circleci/config.yml" }}
diff --git a/.circleci/script/docker b/.circleci/script/docker
index 6291560e..424dda24 100755
--- a/.circleci/script/docker
+++ b/.circleci/script/docker
@@ -21,24 +21,20 @@ if [ -z "$CIRCLE_PULL_REQUEST" ] && [ "$CIRCLE_BRANCH" = "master" ]; then
     docker build -t "$image_name" -f Dockerfile.ci .
     docker tag "$image_name:$latest_tag" "$image_name:$image_tag"
     rm -f bb
-    if [[ $snapshot == "false" ]]; then
-        unzip "/tmp/release/babashka-${image_tag}-linux-static-amd64.zip"
-        docker build -t "$image_name:alpine" -f Dockerfile.alpine .
-        docker tag "$image_name:alpine" "$image_name:$image_tag-alpine"
-    fi
+    unzip "/tmp/release/babashka-${image_tag}-linux-static-amd64.zip"
+    docker build -t "$image_name:alpine" -f Dockerfile.alpine .
+    docker tag "$image_name:alpine" "$image_name:$image_tag-alpine"
     # we only update latest when it's not a SNAPSHOT version
     if [ "false" = "$snapshot" ]; then
         echo "Pushing image $image_name:$latest_tag"
         docker push "$image_name:$latest_tag"
-        echo "Pushing image $image_name:alpine"
-        docker push "$image_name:alpine"
     fi
+    echo "Pushing image $image_name:alpine"
+    docker push "$image_name:alpine"
     # we update the version tag, even if it's a SNAPSHOT version
     echo "Pushing image $image_name:$image_tag"
     docker push "$image_name:$image_tag"
-    if [[ $snapshot == "false" ]]; then
-        docker push "$image_name:$image_tag-alpine"
-    fi
+    docker push "$image_name:$image_tag-alpine"
 else
     echo "Not publishing Docker image"
 fi