Merge pull request #63 from ing-bank/sbt-versioning

Align SBT version with env variable used to build docker container

.travis.yml

@@ -46,14 +46,14 @@ after_success:
 - if [ "$TRAVIS_PULL_REQUEST" != "false" -o "${TRAVIS_BRANCH}" == "master" ]; then
     bash <(curl -s https://codecov.io/bash);
   fi
-- export DOCKER_TAG="${TRAVIS_BRANCH/\//_}"
+- export AIRLOCK_VERSION="${TRAVIS_BRANCH/\//_}"
 - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 - if [ "${TRAVIS_BRANCH}" != "master" ]; then
-    echo "Build image for with name $DOCKER_REPO:$DOCKER_TAG";
+    echo "Build image for with name $DOCKER_REPO:$AIRLOCK_VERSION";
     sbt clean docker:publish;
   fi
 - if [ -n "$TRAVIS_TAG" ]; then
-    docker tag $DOCKER_REPO:$DOCKER_TAG $DOCKER_REPO:latest;
+    docker tag $DOCKER_REPO:$AIRLOCK_VERSION $DOCKER_REPO:latest;
     docker push $DOCKER_REPO:latest;
   fi
 

build.sbt

@@ -2,8 +2,10 @@ import com.typesafe.sbt.packager.docker
 import com.typesafe.sbt.packager.docker.ExecCmd
 import scalariform.formatter.preferences._
 
+val airlockVersion = scala.sys.env.getOrElse("AIRLOCK_VERSION", "SNAPSHOT")
+
 name := "airlock"
-version := "0.1.23"
+version := airlockVersion
 scalaVersion := "2.12.8"
 
 scalacOptions += "-unchecked"
@@ -17,7 +19,7 @@ scalacOptions += "-Xfatal-warnings"
 // Experimental: improved update resolution.
 updateOptions := updateOptions.value.withCachedResolution(cachedResoluton = true)
 
-val akkaHttpVersion       = "10.1.7"
+val akkaHttpVersion = "10.1.7"
 val akkaVersion = "2.5.21"
 val logbackJson = "0.1.5"
 val metricVersion = "4.0.5"
@@ -72,10 +74,7 @@ javaOptions += "-Djava.awt.headless=true"
 dockerExposedPorts := Seq(8080) // should match PROXY_PORT
 dockerCommands     += ExecCmd("ENV", "PROXY_HOST", "0.0.0.0")
 dockerBaseImage    := "openjdk:8u171-jre-slim-stretch"
-dockerAlias        := docker.DockerAlias(Some("docker.io"),
-                                         Some("wbaa"),
-                                         "airlock",
-                                         Option(System.getenv("DOCKER_TAG")))
+dockerAlias        := docker.DockerAlias(Some("docker.io"), Some("wbaa"), "airlock", Some(airlockVersion))
 
 scalariformPreferences := scalariformPreferences.value
     .setPreference(AlignSingleLineCaseStatements, true)