From 41a944371113cb3848d18a817c5db3af8b743efa Mon Sep 17 00:00:00 2001 From: Eric Soroos Date: Wed, 26 Dec 2018 15:46:24 -0800 Subject: [PATCH 1/7] push to docker from travis --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index dcc24765..d38580ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,4 +27,13 @@ install: - cd "$DOCKER" && make update script: + - if [[ -e "$DOCKER_USERNAME" ]]; then + $docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ; + fi - make build && make test + +after_success: + - if [[ "$TRAVIS_BRANCH" == "docker-login" ]]; then + make push-image ; + fi + From acefea7905b00b6930b724d9c187ca8857be11be Mon Sep 17 00:00:00 2001 From: wiredfool Date: Wed, 26 Dec 2018 23:51:48 +0000 Subject: [PATCH 2/7] added secrets --- .travis.yml | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index d38580ec..be56b08c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,9 @@ language: python notifications: - irc: "chat.freenote.net#pil" - + irc: chat.freenote.net#pil dist: trusty services: - - docker - +- docker matrix: fast_finish: true include: @@ -20,20 +18,17 @@ matrix: - env: DOCKER="ubuntu-trusty-x86" - env: DOCKER="ubuntu-xenial-amd64" - env: DOCKER="debian-stretch-x86" - install: - - sudo apt-get update && sudo apt-get install -qyy debootstrap - - sudo chown -R 1000 $TRAVIS_BUILD_DIR - - cd "$DOCKER" && make update - +- sudo apt-get update && sudo apt-get install -qyy debootstrap +- sudo chown -R 1000 $TRAVIS_BUILD_DIR +- cd "$DOCKER" && make update script: - - if [[ -e "$DOCKER_USERNAME" ]]; then - $docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ; - fi - - make build && make test - +- if [[ -n "$DOCKER_USERNAME" ]]; then $docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD + ; fi +- make build && make test after_success: - - if [[ "$TRAVIS_BRANCH" == "docker-login" ]]; then - make push-image ; - fi - +- if [[ "$TRAVIS_BRANCH" == "docker-login" ]]; then make push-image ; fi +env: + global: + - secure: W+ko5Y7TKxxEnJxji3NmnkoT/lRPCA/U6+ahBBQUXRhgbf7A6mXVaGgyBrerY5FZF//XAPYdbOIrVHnkhtUSB2yC//kzHsxWKMU2Rax7b228yfYaeGPtIFJ4MTSszqhadgSFk6zyByMNkz6XoufuY5RVpfp/VMxVR6YcOGmjOUhom92nZ9T2NfVP3HF2RLOn2O5N5+IhqJcGOced5FMIOPkrQcXBiikN2aCUg0KdUrcqRaFiPJINQn/FEWxQN717oAlRY9TE8DaziBIEB/z6nZ7CXLGVitc2jLjd/4fW0KGBB68XIHZ2S3rQ7kkr3y/LhptgZiJiSv+R/rxDC6NrfKwmG16xtDQVbnab9/iskdJax9fuQBlpLcyo+UuXbRs8pTNduJGV46ooOAOfF+2KvjTwLvYk9K6ahpt4W9vjs/ro1fF2gyG5haK/2MAZxT1xkT2WlRZwpDhMgE+ZBznGDMma6fbOvoWGhk7bfKUxVisb+CYuySfvhbdkYem+kMdUfcRb8Qo6750aK/fQdh8Xg9t+yCE4jzdzBH6RbTTmvNGOGFHhShCWmLVXU5LiYNLpxWCahuD4OYMSkq6WdobPKNZxl0xry2gxWLhIAFxoZMqdb2MWjdbf/0BSP0Fe2AliLfgZIXKq6t4l69pNJF2y2WieI6jVfeVotXCS2urVT+c= + - secure: M4xMLq9pWqh89A5S6JkIy9gInAE3PWdIX5Jsf73iM39gAncEDW6h/1iiYr0EPzc0qq3Cc+bWVJ+u+G6dwojATis3ApERqVVlB8Rwk88Xa7IDueKDbjCL7cbLW0tZ9j0Zxdqd5sUiOfpAWQp6Cy3hKYJh9+ScyilxHrG/qr8AH+RAmL+k/BadceftLalCA6GPg4kunukZrEe72c7ITsy75mNyEQtrm2YhDHd/M3sTb+Dl6dScvlZNPrl1fcpDIBvh4eL6XyEC0Of/M7TllYRUW2naBnQJ6ekeIAs6Kj7C7jqfxros+LpeVnXjqyp5SoyJBNB2945GjEQQMm0+mFRtJIRkwPUchhpkJZM+vPRE5Q8xSoHh7LQz2Bmv6KPqWdgwXRF0WQ0ke7Ta2D9ZQ2gAttaoh55etpfsBqC+B2Q1x/bWzDy4U84iDKhni6axbdbCjYJWjTsQgk0qdFt/MtrvB8nJsl3VhEJWZ5ibxxtZRA8NCpL5tdQq2b0s1/AQf9iOSgrfxq+xSpsD7o9BAfPolQyKccZ/cKGkMaUr+4z7xY+Gtr71arg/FtHjwSv7dWukMLbLyPnqcRt1C6mDATwMKkZNEMMYtL8xq0TX1iNYBmONoQCoI8eAKWlNNO8nj/1nLTALanAlz+XTWt1wjfe3g/htjA9LSVrkz0s53wdjmLw= From 06cab459e84445ae9f01934db5226f614b51812c Mon Sep 17 00:00:00 2001 From: wiredfool Date: Thu, 27 Dec 2018 00:00:19 +0000 Subject: [PATCH 3/7] sudo required for interacting with docker login? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be56b08c..25fecd0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: - sudo chown -R 1000 $TRAVIS_BUILD_DIR - cd "$DOCKER" && make update script: -- if [[ -n "$DOCKER_USERNAME" ]]; then $docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD +- if [[ -n "$DOCKER_USERNAME" ]]; then sudo $docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ; fi - make build && make test after_success: From 574cdfa30f61de055c39d6ceab2a29fb6ede67f5 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Thu, 27 Dec 2018 11:07:43 +0000 Subject: [PATCH 4/7] fix copypasta --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 25fecd0a..908b096f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: - sudo chown -R 1000 $TRAVIS_BUILD_DIR - cd "$DOCKER" && make update script: -- if [[ -n "$DOCKER_USERNAME" ]]; then sudo $docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD +- if [[ -n "$DOCKER_USERNAME" ]]; then sudo docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ; fi - make build && make test after_success: From 907082ad5e4000c50c7d3a96ba5abc3b04ea9d29 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Thu, 27 Dec 2018 11:10:18 +0000 Subject: [PATCH 5/7] sudo not required --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 908b096f..5016a7db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ install: - sudo chown -R 1000 $TRAVIS_BUILD_DIR - cd "$DOCKER" && make update script: -- if [[ -n "$DOCKER_USERNAME" ]]; then sudo docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD +- if [[ -n "$DOCKER_USERNAME" ]]; then docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ; fi - make build && make test after_success: From 5e72fe62f7fc16c8f3201a0ac175a10c47edb6c0 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Thu, 27 Dec 2018 11:18:48 +0000 Subject: [PATCH 6/7] more copy-paste --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5016a7db..fbeeb6cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ script: ; fi - make build && make test after_success: -- if [[ "$TRAVIS_BRANCH" == "docker-login" ]]; then make push-image ; fi +- if [[ "$TRAVIS_BRANCH" == "docker-login" ]]; then make push ; fi env: global: - secure: W+ko5Y7TKxxEnJxji3NmnkoT/lRPCA/U6+ahBBQUXRhgbf7A6mXVaGgyBrerY5FZF//XAPYdbOIrVHnkhtUSB2yC//kzHsxWKMU2Rax7b228yfYaeGPtIFJ4MTSszqhadgSFk6zyByMNkz6XoufuY5RVpfp/VMxVR6YcOGmjOUhom92nZ9T2NfVP3HF2RLOn2O5N5+IhqJcGOced5FMIOPkrQcXBiikN2aCUg0KdUrcqRaFiPJINQn/FEWxQN717oAlRY9TE8DaziBIEB/z6nZ7CXLGVitc2jLjd/4fW0KGBB68XIHZ2S3rQ7kkr3y/LhptgZiJiSv+R/rxDC6NrfKwmG16xtDQVbnab9/iskdJax9fuQBlpLcyo+UuXbRs8pTNduJGV46ooOAOfF+2KvjTwLvYk9K6ahpt4W9vjs/ro1fF2gyG5haK/2MAZxT1xkT2WlRZwpDhMgE+ZBznGDMma6fbOvoWGhk7bfKUxVisb+CYuySfvhbdkYem+kMdUfcRb8Qo6750aK/fQdh8Xg9t+yCE4jzdzBH6RbTTmvNGOGFHhShCWmLVXU5LiYNLpxWCahuD4OYMSkq6WdobPKNZxl0xry2gxWLhIAFxoZMqdb2MWjdbf/0BSP0Fe2AliLfgZIXKq6t4l69pNJF2y2WieI6jVfeVotXCS2urVT+c= From ea3906e3e82ee52de1fe0ca1225f5e03a6fe90e2 Mon Sep 17 00:00:00 2001 From: wiredfool Date: Thu, 27 Dec 2018 11:44:46 +0000 Subject: [PATCH 7/7] revert to master push --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fbeeb6cc..51b0a41e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ script: ; fi - make build && make test after_success: -- if [[ "$TRAVIS_BRANCH" == "docker-login" ]]; then make push ; fi +- if [[ "$TRAVIS_BRANCH" == "master" ]]; then make push ; fi env: global: - secure: W+ko5Y7TKxxEnJxji3NmnkoT/lRPCA/U6+ahBBQUXRhgbf7A6mXVaGgyBrerY5FZF//XAPYdbOIrVHnkhtUSB2yC//kzHsxWKMU2Rax7b228yfYaeGPtIFJ4MTSszqhadgSFk6zyByMNkz6XoufuY5RVpfp/VMxVR6YcOGmjOUhom92nZ9T2NfVP3HF2RLOn2O5N5+IhqJcGOced5FMIOPkrQcXBiikN2aCUg0KdUrcqRaFiPJINQn/FEWxQN717oAlRY9TE8DaziBIEB/z6nZ7CXLGVitc2jLjd/4fW0KGBB68XIHZ2S3rQ7kkr3y/LhptgZiJiSv+R/rxDC6NrfKwmG16xtDQVbnab9/iskdJax9fuQBlpLcyo+UuXbRs8pTNduJGV46ooOAOfF+2KvjTwLvYk9K6ahpt4W9vjs/ro1fF2gyG5haK/2MAZxT1xkT2WlRZwpDhMgE+ZBznGDMma6fbOvoWGhk7bfKUxVisb+CYuySfvhbdkYem+kMdUfcRb8Qo6750aK/fQdh8Xg9t+yCE4jzdzBH6RbTTmvNGOGFHhShCWmLVXU5LiYNLpxWCahuD4OYMSkq6WdobPKNZxl0xry2gxWLhIAFxoZMqdb2MWjdbf/0BSP0Fe2AliLfgZIXKq6t4l69pNJF2y2WieI6jVfeVotXCS2urVT+c=