Merge pull request #528 from aaronweaver/master

Working on Version Tagging for Docker.

Author: aaronweaver

.travis.yml

@@ -14,7 +14,7 @@ env:
 
 matrix:
   allow_failures:
-    - env: TEST=bandit 
+    - env: TEST=bandit
     - env: TEST=sourceclear
     - env: TEST=pep8
 
@@ -52,7 +52,7 @@ script:
       bandit)
         # install bandit
         pip install bandit
-  
+
         ## Run Bandit python static code
         bandit -r * -x venv,tests,ansible
         ;;
@@ -71,11 +71,11 @@ script:
     esac
 
 after_success:
-  #Push to docker repo
-  - docker tag $REPO $REPO:$TAG
-  - docker tag $REPO $REPO:travis-$TRAVIS_BUILD_NUMBER
+  #Push to docker repo only if branch is master and this is a release
+    - docker tag $REPO $REPO:$TRAVIS_TAG
   - |
-    if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TEST" == "integration-test" ] && [ "$DOCKER_USER" != "" ] && [  "$DOCKER_PASS" != "" ]; then
+    if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_TAG" != "" ] && [ "$TEST" == "integration-test" ] && [ "$DOCKER_USER" != "" ] && [  "$DOCKER_PASS" != "" ]; then
+      docker tag $REPO $REPO:$TAG
       docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
       docker push $REPO ;
     fi

dojo/__init__.py

@@ -4,7 +4,7 @@
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app  # noqa
 
-__version__ = '1.2.4'
+__version__ = '1.2.5'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'http://defectdojo.readthedocs.io/'
 __demo__ = 'http://defectdojo.pythonanywhere.com/'