Commite453df0

authored

Merge pull request#6 from viniciusam/build_config

Fix build#4

2 parents487bada +967660c commite453df0Copy full SHA for e453df0

File tree

-8

lines changed

-8

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ env:`
`18`	`18`	`-API_DB_USER=api`
`19`	`19`	`-API_DB_PASS=api`
`20`	`20`	`matrix:`
`21`		`- -ORACLE_VERSION="11g-xe-r2"CONNECTION_STR="127.0.0.1:1521/XE"DOCKER_OPTIONS="--shm-size=1g"`
	`21`	`+ -ORACLE_VERSION="11g-xe-r2" DOCKER_OPTIONS="--shm-size=1g"`
`22`	`22`
`23`	`23`	`cache:`
`24`	`24`	`directories:`
`@@ -30,7 +30,6 @@ install:`
`30`	`30`	`-bash .travis/maven_cfg.sh`
`31`	`31`	`-bash .travis/start_db.sh`
`32`	`32`	`-bash .travis/install_utplsql.sh`
`33`		`- -bash .travis/create_app_user.sh`
`34`	`33`
`35`	`34`	`script:`
`36`	`35`	`-mvn test -B`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`#!/bin/bash`
`2`	`2`	`set -ev`
`3`	`3`
`4`		`-sqlplus -S -L/ AS SYSDBA<<EOF`
`5`		`-create user$DB_USER identified by$DB_PASS`
	`4`	`+sqlplus -S -Lsys/oracle@//127.0.0.1:1521/xe AS SYSDBA<<EOF`
	`5`	`+create userapi identified byapi`
`6`	`6`	`quota unlimited on USERS`
`7`	`7`	`default tablespace USERS;`
`8`	`8`	`grant create session,`
`@@ -11,7 +11,7 @@ grant create session,`
`11`	`11`	`create table,`
`12`	`12`	`create sequence,`
`13`	`13`	`create view`
`14`		`-to$DB_USER;`
`15`		`-grant select any dictionary to$DB_USER;`
	`14`	`+toapi;`
	`15`	`+grant select any dictionary toapi;`
`16`	`16`	`exit;`
`17`	`17`	`EOF`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ git clone -b develop --single-branch https://github.com/utPLSQL/utPLSQL.git`
`17`	`17`	`cat> install.sh.tmp<<EOF`
`18`	`18`	`# tar -xzf$UTPLSQL_FILE.tar.gz && rm$UTPLSQL_FILE.tar.gz`
`19`	`19`	`cd /$UTPLSQL_FILE/source`
`20`		`-sqlplus -S -L sys/oracle@//$CONNECTION_STR AS SYSDBA @install_headless.sql`
	`20`	`+sqlplus -S -L sys/oracle@//127.0.0.1:1521/xe AS SYSDBA @install_headless.sql`
`21`	`21`	`EOF`
`22`	`22`
`23`	`23`	`# 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`
`31`	`31`	`rm install.sh.tmp`
`32`	`32`
`33`	`33`	`# Execute the utPLSQL installation inside the container.`
`34`		`-dockerexec$ORACLE_VERSION bash -c"/install.sh && /create_api_user.sh"`
	`34`	`+dockerexec$ORACLE_VERSION bash install.sh`
	`35`	`+dockerexec$ORACLE_VERSION bash create_api_user.sh`

Comments

(0)