update to use semver

Author: wildone

.gitlab-ci.yml

@@ -4,6 +4,7 @@ services:
   - 'docker'
 
 before_install:
+  - echo GET CONFIG FROM DOCKERFILE
   - export IMAGE_NAME=$(grep imagename= Dockerfile | sed -e 's/.*imagename="\(.*\)".*/\1/')
   - export TEST_COMMAND=$(grep test.command= Dockerfile | sed -e 's/.*test.command="\(.*\)".*/\1/')
   - export TEST_COMMAND_VERIFY=$(grep test.command.verify= Dockerfile | sed -e 's/.*test.command.verify="\(.*\)".*/\1/')
@@ -13,40 +14,49 @@ before_install:
   - echo IMAGE_VERSION=$IMAGE_VERSION
   - echo TEST_COMMAND=$TEST_COMMAND
   - echo TEST_COMMAND_VERIFY=$TEST_COMMAND_VERIFY
+  - echo GET CONFIG FROM GIT
+  - export CURRENT_VERSION=$(git describe --tag --always --long | sed -e 's/\(.*\)-\(.*\)-.*/\1.\2/')
+  - declare -a CURRENT_VERSION_ARRAY="(${CURRENT_VERSION//./ })"; export SEMVER_MAJOR=${CURRENT_VERSION_ARRAY[0]}; export SEMVER_MINOR=${CURRENT_VERSION_ARRAY[1]}; export SEMVER_BUILD=${CURRENT_VERSION_ARRAY[-1]}
+  - echo SEMVER_MAJOR:${SEMVER_MAJOR}
+  - echo SEMVER_MINOR:${SEMVER_MINOR}
+  - echo SEMVER_BUILD:${SEMVER_BUILD}
+  - export SEMVER=${SEMVER_MAJOR}.${SEMVER_MINOR}.${SEMVER_BUILD}
+  - echo SEMVER:$SEMVER
+  - if [[ ${SEMVER_MAJOR} == "" ]]; then travis_terminate 1; fi
+  - export TRAVIS_TAG=$SEMVER
+  - echo TRAVIS_TAG:$TRAVIS_TAG
 
 #build and test
 install:
   - docker build --pull -t $IMAGE:$IMAGE_VERSION .
-  - docker tag $IMAGE:$IMAGE_VERSION $IMAGE:latest
-  - export CONTAINER_COMMAND="docker run $IMAGE $TEST_COMMAND"
+  - export CONTAINER_COMMAND="docker run $IMAGE:$IMAGE_VERSION $TEST_COMMAND"
   - echo CONTAINER_COMMAND=$CONTAINER_COMMAND
   - export CONTAINER_OUTPUT=$(eval $CONTAINER_COMMAND)
   - echo CONTAINER_OUTPUT=$CONTAINER_OUTPUT
   - if [[ ! ${CONTAINER_OUTPUT} =~ ${TEST_COMMAND_VERIFY} ]]; then travis_terminate 1; fi
-  - docker tag $IMAGE:$IMAGE_VERSION $IMAGE:$CONTAINER_OUTPUT
   - docker images
 
 #test
 script:
   - echo "LOGIN TO HUB.DOCKER"
   - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
   - echo "PUSH HUB.DOCKER"
-  - docker push $IMAGE:$IMAGE_VERSION && docker push $IMAGE:$CONTAINER_OUTPUT && if [[ $TRAVIS_BRANCH == "master" ]]; then docker push $IMAGE:latest; fi
+  - docker push $IMAGE:$IMAGE_VERSION
+  - if [[ $TRAVIS_BRANCH == "master" ]]; then docker tag $IMAGE:$IMAGE_VERSION $IMAGE:latest && docker push $IMAGE:latest; fi
   - echo "UPDATE README IN HUB.DOCKER"
   - if [[ $TRAVIS_BRANCH == "master" ]]; then docker run --rm -v $(pwd):/data/ aemdesign/dockerhub-description "$DOCKER_USERNAME" "$DOCKER_PASSWORD" "$IMAGE"; fi
 
 ## Get the project version
 before_deploy:
-  - export CURRENT_VERSION=$(git describe --tag --always --long | sed -e 's/\(.*\)-\(.*\)-.*/\1.\2/')
-  - echo CURRENT_VERSION=$CURRENT_VERSION
-  - export TRAVIS_TAG=$CURRENT_VERSION
   - if [[ $TRAVIS_BRANCH == "master" ]]; then git tag $TRAVIS_TAG; fi
 
 ## Create release in GitHub
 deploy:
   provider: releases
+  tag_name: $TRAVIS_TAG
+  name: $TRAVIS_TAG
+  target_commitish: $TRAVIS_COMMIT
   api_key: $GITHUB_TOKEN
   skip_cleanup: true
   on:
     branch: master
-  name: $CURRENT_VERSION

.travis.yml

@@ -1,4 +1,4 @@
-FROM        aemdesign/oracle-jdk:1.0-jdk8
+FROM        aemdesign/oracle-jdk:jdk8
 
 MAINTAINER  devops <devops@aem.design>