Docker: Updated image versioning

.gitlab-ci.yml

 variables:
+  VERSION:                "3.0.0-alpha"
   DOCKER_VERSION:         latest
   DOCKER_HOST:            "genesys1.swarm.genesys-pgr.org"
   # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
@@ -70,9 +71,17 @@ package amphibian branch:
     - cd amphibian-server
     - cp target/*.war docker
     - cd docker
-    - ${DOCKER_CMD} build -t ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG} .
+    - if [ "${CI_COMMIT_REF_SLUG}" = "master" ] ; then
+        export IMAGE_TAG="${VERSION}";
+        export IMAGE_EXTRA="latest";
+      else
+        export IMAGE_TAG="${CI_COMMIT_REF_SLUG}";
+      fi
+    - "echo The image tag: ${IMAGE_TAG}"
+    - ${DOCKER_CMD} build -t ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} .
     - ${DOCKER_CMD} login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
-    - ${DOCKER_CMD} push ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}
+    - ${DOCKER_CMD} push ${CI_REGISTRY_IMAGE}:${IMAGE_TAG}
+    - if [ "${IMAGE_EXTRA}" != "" ];  then ${DOCKER_CMD} tag ${CI_REGISTRY_IMAGE}:${IMAGE_TAG} ${CI_REGISTRY_IMAGE}:${IMAGE_EXTRA}; ${DOCKER_CMD} push ${CI_REGISTRY_IMAGE}:${IMAGE_EXTRA}; fi
     - ${DOCKER_CMD} logout $CI_REGISTRY
 
 dockerize amphibian:
@@ -117,7 +126,7 @@ deploy on staging server:
   variables:
     GIT_STRATEGY:         none
   script:
-    - echo Deploying ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG} to staging server
+    - echo Deploying ${CI_REGISTRY_IMAGE}:latest to staging server
     # Address the swarm
     - export DOCKER_HOST=swarm.genesys-pgr.org
     # Configuration
@@ -129,7 +138,7 @@ deploy on staging server:
     - export DOCKER_CERT_PATH=${TLS_PATH}
     - DOCKER_CMD=docker
     # Actions
-    - ${DOCKER_CMD} service update --image ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG} amphibian_sandbox
+    - ${DOCKER_CMD} service update --image ${CI_REGISTRY_IMAGE}:latest amphibian_sandbox
 
 
 deploy to production: