From 0fb1a5ebb21b322882a1be27ce638e815243bc5d Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:06:20 +0300 Subject: [PATCH 01/10] Update .travis.yml --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2e718f78..0dbb883ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,5 @@ before_install: - sudo apt-get install g++ build-essential script: - - pwd - - cd docker - - pwd - - docker build -t nrel/api-umbrella:test . - - docker tag nrel/api-umbrella:test nrel/api-umbrella:latest + - ./.scripts/docker_build.sh From 910dcb2c37b584771de84d5c9dc5d1cb2c022173 Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:06:55 +0300 Subject: [PATCH 02/10] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0dbb883ac..1e8cb1fe0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,5 @@ before_install: - sudo apt-get install g++ build-essential script: - - ./.scripts/docker_build.sh + - ./scripts/docker_build.sh From b5f962cbc936b8d736d6f7ba1557192271141aba Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:07:37 +0300 Subject: [PATCH 03/10] Update docker_build.sh --- scripts/docker_build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh index 9e01282b5..6532e4471 100644 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -7,6 +7,10 @@ set -ev +pwd + +cd docker + docker build -t apinf/apinf-umbrella:$DOCKER_TAG . if [ "${TRAVIS_PULL_REQUEST}" = "false" -a "${TRAVIS_REPO_SLUG}" = "apinf/apinf-umbrella" ] From 77cad56a6bef71705d18631dff55cc0787a860b1 Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:13:15 +0300 Subject: [PATCH 04/10] Update .travis.yml to debug error: exited with 126. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1e8cb1fe0..708c820c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,6 @@ before_install: - sudo apt-get install g++ build-essential script: + - whoami - ./scripts/docker_build.sh From ab9dfab595b628b7c66162b8e0231cd77e124db5 Mon Sep 17 00:00:00 2001 From: Vikram kyama <46559025+vikramkyama-trigyn@users.noreply.github.com> Date: Tue, 30 Apr 2019 16:50:39 +0530 Subject: [PATCH 05/10] Update .travis.yml execute permission to the user travis added --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 708c820c7..3869b93a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,5 +8,6 @@ before_install: script: - whoami + - chmod +x ./scripts/docker_build.sh - ./scripts/docker_build.sh From ad104378c409db083c3fddef872208872b863e77 Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:24:05 +0300 Subject: [PATCH 06/10] Update docker_build.sh --- scripts/docker_build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh index 6532e4471..3dcaeba15 100644 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -11,7 +11,8 @@ pwd cd docker -docker build -t apinf/apinf-umbrella:$DOCKER_TAG . +#docker build -t apinf/apinf-umbrella:$DOCKER_TAG . +docker build -t apinf/apinf-umbrella:test . if [ "${TRAVIS_PULL_REQUEST}" = "false" -a "${TRAVIS_REPO_SLUG}" = "apinf/apinf-umbrella" ] then From 5faa873feca181dd05c1c22bae4fda8ea9e42545 Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:34:47 +0300 Subject: [PATCH 07/10] Update docker_build.sh update docker username and password --- scripts/docker_build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/docker_build.sh b/scripts/docker_build.sh index 3dcaeba15..6532e4471 100644 --- a/scripts/docker_build.sh +++ b/scripts/docker_build.sh @@ -11,8 +11,7 @@ pwd cd docker -#docker build -t apinf/apinf-umbrella:$DOCKER_TAG . -docker build -t apinf/apinf-umbrella:test . +docker build -t apinf/apinf-umbrella:$DOCKER_TAG . if [ "${TRAVIS_PULL_REQUEST}" = "false" -a "${TRAVIS_REPO_SLUG}" = "apinf/apinf-umbrella" ] then From 23591398fada01f2d1b7262f8615625d9dd72a8d Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:38:08 +0300 Subject: [PATCH 08/10] Update .travis.yml limit build only to develop --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3869b93a3..583e12de5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,10 @@ services: - docker +branches: + only: + - develop + before_install: - ls -la - sudo apt-get update From 9465522370eb6841af7d08e21f920848a64ed8da Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:40:43 +0300 Subject: [PATCH 09/10] Update .travis.yml develop-> master (there is no develop branch) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 583e12de5..61d9d34ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ services: branches: only: - - develop + - master before_install: - ls -la From 5dd994a4e8f8dd0fa972a086a47e8f7735c673f3 Mon Sep 17 00:00:00 2001 From: ilarimikkonen Date: Tue, 30 Apr 2019 14:42:29 +0300 Subject: [PATCH 10/10] Update .travis.yml remove branch limit --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 61d9d34ae..3869b93a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,6 @@ services: - docker -branches: - only: - - master - before_install: - ls -la - sudo apt-get update