Using container ip.

viniciusam · viniciusam · commit b78c3c05bdcc · 2017-03-11T16:26:05.000-03:00
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,7 @@ env:
     - PAGES_TARGET_BRANCH="gh-pages"
     - PAGES_VERSION_BASE="version3"
     - SQLCLI=$HOME/.cache/sqlcl/bin/sql
+    - CONTAINER_IP=""
 
 addons:
   apt:
@@ -61,6 +62,7 @@ script:
   - docker run -d --name oracle-12c-r1-se -p 1521:1521 -p 5500:5500 viniciusam/oracle-12c-r1-se
   - docker logs -f oracle-12c-r1-se | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
   - docker exec oracle-12c-r1-se ./setPassword.sh oracle
+  - CONTAINER_IP=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' oracle-12c-r1-se)
   - bash .travis/create_utplsql_owner.sh
   - bash .travis/create_utplsql_user.sh
   - bash .travis/install_libraries.sh
diff --git a/.travis/create_utplsql_owner.sh b/.travis/create_utplsql_owner.sh
@@ -3,7 +3,7 @@ set -ev
 
 cd $(dirname "$(readlink -f "$0")")
 #create user
-"$SQLCLI" -L -S sys/oracle@//oracle-12c-r1-se:1521/ORCLCDB AS SYSDBA <<SQL
+"$SQLCLI" -L -S sys/oracle@//$CONTAINER_IP:1521/ORCLCDB AS SYSDBA <<SQL
 set echo off
 @@create_utplsql_owner.sql $UT3_OWNER $UT3_OWNER_PASSWORD $UT3_OWNER_TABLESPACE
 SQL
diff --git a/.travis/create_utplsql_user.sh b/.travis/create_utplsql_user.sh
@@ -3,7 +3,7 @@ set -ev
 
 cd $(dirname "$(readlink -f "$0")")
 #create user
-"$SQLCLI" -L -S sys/oracle@//oracle-12c-r1-se:1521/ORCLCDB AS SYSDBA <<SQL
+"$SQLCLI" -L -S sys/oracle@//$CONTAINER_IP:1521/ORCLCDB AS SYSDBA <<SQL
 set echo off
 @@create_utplsql_user.sql $UT3_USER $UT3_USER_PASSWORD $UT3_USER_TABLESPACE
 SQL
diff --git a/.travis/grant_user.sh b/.travis/grant_user.sh
@@ -4,6 +4,6 @@ set -ev
 
 cd source
 #grant framework user
-"$SQLCLI" -L -S sys/oracle@//oracle-12c-r1-se:1521/ORCLCDB AS SYSDBA <<SQL
+"$SQLCLI" -L -S sys/oracle@//$CONTAINER_IP:1521/ORCLCDB AS SYSDBA <<SQL
 @create_synonyms_and_grants_for_user.sql $UT3_OWNER $UT3_USER
 SQL
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -4,13 +4,13 @@ set -ev
 
 cd source
 #install core of utplsql
-"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD @install.sql $UT3_OWNER
+"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONTAINER_IP:1521/ORCLCDB @install.sql $UT3_OWNER
 
 
 cd ..
 cd development
 #do style check
-"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD @utplsql_style_check.sql
+"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONTAINER_IP:1521/ORCLCDB @utplsql_style_check.sql
 
 #enable plsql debug
-"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD @ut_debug_enable.sql
+"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONTAINER_IP:1521/ORCLCDB @ut_debug_enable.sql
diff --git a/.travis/run_examples_as_owner.sh b/.travis/run_examples_as_owner.sh
@@ -3,4 +3,4 @@
 set -ev
 
 cd examples
-"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD @RunAllExamplesAsTests.sql
+"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONTAINER_IP:1521/ORCLCDB @RunAllExamplesAsTests.sql
diff --git a/.travis/run_examples_as_user.sh b/.travis/run_examples_as_user.sh
@@ -3,7 +3,7 @@
 set -ev
 
 cd examples
-"$SQLCLI" $UT3_USER/$UT3_USER_PASSWORD <<SQL
+"$SQLCLI" $UT3_USER/$UT3_USER_PASSWORD@//$CONTAINER_IP:1521/ORCLCDB <<SQL
 whenever sqlerror exit failure rollback
 whenever oserror exit failure rollback
 
diff --git a/.travis/run_test_as_owner.sh b/.travis/run_test_as_owner.sh
@@ -3,4 +3,4 @@
 set -ev
 
 cd tests
-"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD @RunAll.sql
+"$SQLCLI" $UT3_OWNER/$UT3_OWNER_PASSWORD@//$CONTAINER_IP:1521/ORCLCDB @RunAll.sql
diff --git a/.travis/run_test_as_user.sh b/.travis/run_test_as_user.sh
@@ -3,4 +3,4 @@
 set -ev
 
 cd tests
-"$SQLCLI" $UT3_USER/$UT3_USER_PASSWORD @RunAll.sql
+"$SQLCLI" $UT3_USER/$UT3_USER_PASSWORD@//$CONTAINER_IP:1521/ORCLCDB @RunAll.sql
