From fe51afd0687a5b35809a4b1cb7c12fdbf3fbf7ab Mon Sep 17 00:00:00 2001 From: Abdullah Almsaeed Date: Thu, 26 Apr 2018 10:00:38 -0400 Subject: [PATCH 1/4] Add better docker tests --- .travis.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d427096..b8b496f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,17 @@ services: sudo: required script: - - docker build Drupal/. - - docker build Tripal2/. - - docker build Tripal3/. + - docker build Drupal/. -t myDrupal7 + - docker build Tripal2/. -t myTripal2 + - docker build Tripal3/. -t myTripal3 + # Spin all containers up and make sure we get HTTP status OK 200 + - docker run -itd --rm --name drupal7 -p 8080:80 myDrupal7 + - docker run -itd --rm --name drupal7 -p 8081:80 myTripal2 + - docker run -itd --rm --name drupal7 -p 8082:80 myTripal3 + # Allow all services to become active + - sleep 60 + # Make sure all servers give the correct status + - curl -si localhost:8080 | grep "HTTP/1.1 200 OK" || exit 1 + - curl -si localhost:8081 | grep "HTTP/1.1 200 OK" || exit 1 + - curl -si localhost:8082 | grep "HTTP/1.1 200 OK" || exit 1 From cb33febb7fba96a79094ad669910560a6e05bae9 Mon Sep 17 00:00:00 2001 From: Abdullah Almsaeed Date: Thu, 26 Apr 2018 10:04:39 -0400 Subject: [PATCH 2/4] Fix repo names --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index b8b496f..ab70674 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,13 @@ services: sudo: required script: - - docker build Drupal/. -t myDrupal7 - - docker build Tripal2/. -t myTripal2 - - docker build Tripal3/. -t myTripal3 + - docker build Drupal/. -t mydrupal7 + - docker build Tripal2/. -t mytripal2 + - docker build Tripal3/. -t mytripal3 # Spin all containers up and make sure we get HTTP status OK 200 - - docker run -itd --rm --name drupal7 -p 8080:80 myDrupal7 - - docker run -itd --rm --name drupal7 -p 8081:80 myTripal2 - - docker run -itd --rm --name drupal7 -p 8082:80 myTripal3 + - docker run -itd --rm --name drupal7 -p 8080:80 mydrupal7 + - docker run -itd --rm --name drupal7 -p 8081:80 mytripal2 + - docker run -itd --rm --name drupal7 -p 8082:80 mytripal3 # Allow all services to become active - sleep 60 # Make sure all servers give the correct status From f1b495b60d62609c11780446b53626eebf3cc9ec Mon Sep 17 00:00:00 2001 From: Abdullah Almsaeed Date: Thu, 26 Apr 2018 10:15:08 -0400 Subject: [PATCH 3/4] Fix container names --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab70674..8d0f175 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ script: - docker build Tripal3/. -t mytripal3 # Spin all containers up and make sure we get HTTP status OK 200 - docker run -itd --rm --name drupal7 -p 8080:80 mydrupal7 - - docker run -itd --rm --name drupal7 -p 8081:80 mytripal2 - - docker run -itd --rm --name drupal7 -p 8082:80 mytripal3 + - docker run -itd --rm --name tripal2 -p 8081:80 mytripal2 + - docker run -itd --rm --name tripal3 -p 8082:80 mytripal3 # Allow all services to become active - sleep 60 # Make sure all servers give the correct status From 637e3284b62e640c53a9cf1cc6984e642acd3c3e Mon Sep 17 00:00:00 2001 From: Abdullah Almsaeed Date: Thu, 26 Apr 2018 10:30:58 -0400 Subject: [PATCH 4/4] Attempt using different ports --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8d0f175..7d42671 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,11 @@ script: - docker build Tripal3/. -t mytripal3 # Spin all containers up and make sure we get HTTP status OK 200 - docker run -itd --rm --name drupal7 -p 8080:80 mydrupal7 - - docker run -itd --rm --name tripal2 -p 8081:80 mytripal2 - - docker run -itd --rm --name tripal3 -p 8082:80 mytripal3 + - docker run -itd --rm --name tripal2 -p 9090:80 mytripal2 + - docker run -itd --rm --name tripal3 -p 8085:80 mytripal3 # Allow all services to become active - sleep 60 # Make sure all servers give the correct status - curl -si localhost:8080 | grep "HTTP/1.1 200 OK" || exit 1 - - curl -si localhost:8081 | grep "HTTP/1.1 200 OK" || exit 1 - - curl -si localhost:8082 | grep "HTTP/1.1 200 OK" || exit 1 - + - curl -si localhost:9090 | grep "HTTP/1.1 200 OK" || exit 1 + - curl -si localhost:8085 | grep "HTTP/1.1 200 OK" || exit 1