From 49a6c5f4edcd647e85184c88e6d336ad918e2750 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Wed, 13 Dec 2017 17:51:35 +0100 Subject: [PATCH] Fixed docker upload in travis --- .travis.yml | 8 ++++---- travis/generate_travis.py | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e0566f2f..4995abe2d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -292,8 +292,8 @@ jobs: after_failure: - find build -iname '*err*.log' -type f -print -exec cat {} \; after_success: - - docker login -u '$DOCKER_USERNAME' -p '$DOCKER_PASSWORD'; - - docker tag storm mvolk/storm-debug:travis; + - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"; + - docker commit storm mvolk/storm-debug:travis; - docker push mvolk/storm-debug:travis; - stage: Test all os: linux @@ -308,7 +308,7 @@ jobs: after_failure: - find build -iname '*err*.log' -type f -print -exec cat {} \; after_success: - - docker login -u '$DOCKER_USERNAME' -p '$DOCKER_PASSWORD'; - - docker tag storm mvolk/storm:travis; + - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD"; + - docker commit storm mvolk/storm:travis; - docker push mvolk/storm:travis; diff --git a/travis/generate_travis.py b/travis/generate_travis.py index c50201563..b104661f1 100644 --- a/travis/generate_travis.py +++ b/travis/generate_travis.py @@ -122,12 +122,12 @@ if __name__ == "__main__": # Upload to dockerhub if stage[1] == "TestAll": buildConfig += " after_success:\n" - buildConfig += " - docker login -u '$DOCKER_USERNAME' -p '$DOCKER_PASSWORD';\n" + buildConfig += ' - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD";\n' if "Debug" in build: - buildConfig += " - docker tag storm mvolk/storm-debug:travis;\n" + buildConfig += " - docker commit storm mvolk/storm-debug:travis;\n" buildConfig += " - docker push mvolk/storm-debug:travis;\n" elif "Release" in build: - buildConfig += " - docker tag storm mvolk/storm:travis;\n" + buildConfig += " - docker commit storm mvolk/storm:travis;\n" buildConfig += " - docker push mvolk/storm:travis;\n" else: assert False