switched docker image

Pazus · Pazus · commit 7cceac355d85 · 2017-03-27T22:16:24.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -35,7 +35,7 @@ env:
   matrix:
     - ORACLE_VERSION="12c-se-r1" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1'
     - ORACLE_VERSION="11g-xe-r2" CONNECTION_STR='127.0.0.1:1521/XE'        DOCKER_OPTIONS='--shm-size=1g'
-    - ORACLE_VERSION="12c-se2-r2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1'
+    - ORACLE_VERSION="12c-se2-r2-v2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1'
 
 cache:
   pip: true
diff --git a/.travis/start_db.sh b/.travis/start_db.sh
@@ -12,18 +12,13 @@ else
     mkdir -p $HOME/.docker && cp $CACHE_DIR/.docker/config.json $HOME/.docker/
 fi
 
-docker pull $DOCKER_BASE_TAG:$ORACLE_VERSION
-docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKER_BASE_TAG:$ORACLE_VERSION
-docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
 
 if [ "$ORACLE_VERSION" == "12c-se2-r2" ]; then
-    "$SQLCLI" sys/oracle@//127.0.0.1:1521/ORCLCDB as sysdba <<EOF
-CREATE PLUGGABLE DATABASE ORCLPDB1 ADMIN USER PDBADMIN IDENTIFIED BY "$ORACLE_PWD"
-  FILE_NAME_CONVERT=('/opt/oracle/oradata/ORCLCDB/pdbseed/','/opt/oracle/oradata/ORCLPDB1/');
-ALTER PLUGGABLE DATABASE ORCLPDB1 SAVE STATE;  
-ALTER PLUGGABLE DATABASE ORCLPDB1 OPEN READ WRITE;
-ALTER SESSION SET CONTAINER = ORCLPDB1;
-CREATE TABLESPACE users DATAFILE '/opt/oracle/oradata/ORCLPDB1/users01.dbf' SIZE 1M AUTOEXTEND ON NEXT 1M;
-exit;
-EOF
-fi
+mkdir -p /dev/pdbs
+docker pull $DOCKER_BASE_TAG:$ORACLE_VERSION
+docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 -v /dev/pdbs:/opt/oracle/oradata/pdbs $DOCKER_BASE_TAG:$ORACLE_VERSION
+else
+docker pull $DOCKER_BASE_TAG:$ORACLE_VERSION
+docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKER_BASE_TAG:$ORACLE_VERSION
+fi
+docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered
