From b867e5366ab508133dcd691f8ec78cc8622895df Mon Sep 17 00:00:00 2001
From: Matthias Volk <matthias.volk@cs.rwth-aachen.de>
Date: Fri, 16 Feb 2018 18:23:59 +0100
Subject: [PATCH] Travis: use better tagging structure

---
 .travis.yml                                 | 8 ++++----
 travis/build.sh                             | 2 +-
 travis/{build-helper.sh => build_helper.sh} | 0
 travis/generate_travis.py                   | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename travis/{build-helper.sh => build_helper.sh} (100%)

diff --git a/.travis.yml b/.travis.yml
index 16522980c..2a08f13c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,8 @@ jobs:
         - travis/build_carl.sh
       after_success:
         - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
-        - docker commit carl mvolk/carl-debug:travis;
-        - docker push mvolk/carl-debug:travis;
+        - docker commit carl mvolk/carl:travis-debug;
+        - docker push mvolk/carl:travis-debug;
     # ubuntu-17.10 - DefaultReleaseTravis
     - stage: Build Carl
       os: linux
@@ -341,8 +341,8 @@ jobs:
         - find build -iname '*err*.log' -type f -print -exec cat {} \;
       after_success:
         - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";
-        - docker commit storm mvolk/storm-debug:travis;
-        - docker push mvolk/storm-debug:travis;
+        - docker commit storm mvolk/storm:travis-debug;
+        - docker push mvolk/storm:travis-debug;
     # ubuntu-17.10 - DefaultReleaseTravis
     - stage: Test all
       os: linux
diff --git a/travis/build.sh b/travis/build.sh
index 998ec7075..2fd306bca 100755
--- a/travis/build.sh
+++ b/travis/build.sh
@@ -28,7 +28,7 @@ linux)
     set -e
     case "$CONFIG" in
     *DebugTravis)
-        docker run -d -it --name storm --privileged mvolk/carl-debug:travis
+        docker run -d -it --name storm --privileged mvolk/carl:travis-debug
         ;;
     *ReleaseTravis)
         docker run -d -it --name storm --privileged mvolk/carl:travis
diff --git a/travis/build-helper.sh b/travis/build_helper.sh
similarity index 100%
rename from travis/build-helper.sh
rename to travis/build_helper.sh
diff --git a/travis/generate_travis.py b/travis/generate_travis.py
index 4145711b4..fd97dc253 100644
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@@ -90,8 +90,8 @@ if __name__ == "__main__":
             buildConfig += "      after_success:\n"
             buildConfig += '        - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";\n'
             if "Debug" in build_type:
-                buildConfig += "        - docker commit carl mvolk/carl-debug:travis;\n"
-                buildConfig += "        - docker push mvolk/carl-debug:travis;\n"
+                buildConfig += "        - docker commit carl mvolk/carl:travis-debug;\n"
+                buildConfig += "        - docker push mvolk/carl:travis-debug;\n"
             elif "Release" in build_type:
                 buildConfig += "        - docker commit carl mvolk/carl:travis;\n"
                 buildConfig += "        - docker push mvolk/carl:travis;\n"
@@ -154,8 +154,8 @@ if __name__ == "__main__":
                 buildConfig += "      after_success:\n"
                 buildConfig += '        - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";\n'
                 if "Debug" in build_type:
-                    buildConfig += "        - docker commit storm mvolk/storm-debug:travis;\n"
-                    buildConfig += "        - docker push mvolk/storm-debug:travis;\n"
+                    buildConfig += "        - docker commit storm mvolk/storm:travis-debug;\n"
+                    buildConfig += "        - docker push mvolk/storm:travis-debug;\n"
                 elif "Release" in build_type:
                     buildConfig += "        - docker commit storm mvolk/storm:travis;\n"
                     buildConfig += "        - docker push mvolk/storm:travis;\n"