Merge pull request #6 from viniciusam/build_config

viniciusam · web-flow · commit e453df0062d7 · 2017-05-18T22:24:44.000-03:00
Fix build #4
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ env:
     - API_DB_USER=api
     - API_DB_PASS=api
   matrix:
-    - ORACLE_VERSION="11g-xe-r2" CONNECTION_STR="127.0.0.1:1521/XE" DOCKER_OPTIONS="--shm-size=1g"
+    - ORACLE_VERSION="11g-xe-r2" DOCKER_OPTIONS="--shm-size=1g"
 
 cache:
   directories:
@@ -30,7 +30,6 @@ install:
   - bash .travis/maven_cfg.sh
   - bash .travis/start_db.sh
   - bash .travis/install_utplsql.sh
-  - bash .travis/create_app_user.sh
 
 script:
   - mvn test -B
diff --git a/.travis/create_api_user.sh b/.travis/create_api_user.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 set -ev
 
-sqlplus -S -L / AS SYSDBA <<EOF
-create user $DB_USER identified by $DB_PASS
+sqlplus -S -L sys/oracle@//127.0.0.1:1521/xe AS SYSDBA <<EOF
+create user api identified by api
 quota unlimited on USERS
 default tablespace USERS;
 grant create session,
@@ -11,7 +11,7 @@ grant create session,
 	  create table,
 	  create sequence,
 	  create view
-to $DB_USER;
-grant select any dictionary to $DB_USER;
+to api;
+grant select any dictionary to api;
 exit;
 EOF
diff --git a/.travis/install_utplsql.sh b/.travis/install_utplsql.sh
@@ -17,7 +17,7 @@ git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL.git
 cat > install.sh.tmp <<EOF
 # tar -xzf $UTPLSQL_FILE.tar.gz && rm $UTPLSQL_FILE.tar.gz
 cd /$UTPLSQL_FILE/source
-sqlplus -S -L sys/oracle@//$CONNECTION_STR AS SYSDBA @install_headless.sql
+sqlplus -S -L sys/oracle@//127.0.0.1:1521/xe AS SYSDBA @install_headless.sql
 EOF
 
 # Copy utPLSQL files to the container and install it.
@@ -31,4 +31,5 @@ docker cp ./create_api_user.sh $ORACLE_VERSION:/create_api_user.sh
 rm install.sh.tmp
 
 # Execute the utPLSQL installation inside the container.
-docker exec $ORACLE_VERSION bash -c "/install.sh && /create_api_user.sh"
+docker exec $ORACLE_VERSION bash install.sh
+docker exec $ORACLE_VERSION bash create_api_user.sh
