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

Align docker version with sbt version

.travis.yml

@@ -29,13 +29,13 @@ script:
 
 after_success:
 - bash <(curl -s https://codecov.io/bash)
-- export DOCKER_TAG="${TRAVIS_BRANCH/\//_}"
+- export AIRLOCK_STS_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_STS_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_STS_VERSION $DOCKER_REPO:latest;
     docker push $DOCKER_REPO:latest;
   fi

build.sbt

@@ -2,10 +2,10 @@ import com.typesafe.sbt.packager.docker
 import com.typesafe.sbt.packager.docker.ExecCmd
 import scalariform.formatter.preferences._
 
-name := "airlock-sts"
-
-version := "0.1.9"
+val airlockStsVersion = scala.sys.env.getOrElse("AIRLOCK_STS_VERSION", "SNAPSHOT")
 
+name := "airlock-sts"
+version := airlockStsVersion
 scalaVersion := "2.12.8"
 
 scalacOptions := Seq(
@@ -65,10 +65,7 @@ fork := true
 dockerExposedPorts := Seq(12345)
 dockerCommands += ExecCmd("ENV", "PROXY_HOST", "0.0.0.0")
 dockerBaseImage := "openjdk:8u171-jre-slim-stretch"
-dockerAlias := docker.DockerAlias(Some("docker.io"),
-  Some("wbaa"),
-  "airlock-sts",
-  Option(System.getenv("DOCKER_TAG")))
+dockerAlias := docker.DockerAlias(Some("docker.io"), Some("wbaa"), "airlock-sts", Some(airlockStsVersion))
 
 scalariformPreferences := scalariformPreferences.value
   .setPreference(AlignSingleLineCaseStatements, true)