From 402d85218a1bed42228882b5931d99b6aa13c7bd Mon Sep 17 00:00:00 2001 From: Pazus Date: Sat, 22 Jul 2017 13:43:46 +0300 Subject: [PATCH 1/2] move to out own docker repo --- .travis.yml | 8 +++++--- .travis/start_db.sh | 6 ++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54a9a1697..3e96c9135 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,10 +39,12 @@ env: # Database Env - SQLCLI="$HOME/sqlcl/bin/sql" - ORACLE_PWD="oracle" + - UT3_DOCKER_REPO="utplsqlv3/oracledb" + - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}" matrix: - - ORACLE_VERSION="11g-xe-r2" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g' - - ORACLE_VERSION="12c-se2-r1-v2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" - - ORACLE_VERSION="12c-se-r2-v4" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" + - ORACLE_VERSION="11g-r2-xe" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g' + - ORACLE_VERSION="12c-r1-se2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" + - ORACLE_VERSION="12c-r2-se2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" cache: pip: true diff --git a/.travis/start_db.sh b/.travis/start_db.sh index d77d0dd90..2f71c07bd 100644 --- a/.travis/start_db.sh +++ b/.travis/start_db.sh @@ -1,8 +1,6 @@ #!/bin/bash set -e -DOCKER_BASE_TAG="viniciusam/oracledb" - # Private Repo Login if [ ! -f $CACHE_DIR/.docker/config.json ]; then docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" @@ -12,6 +10,6 @@ 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 pull $DOCKHER_HUB_REPO:$ORACLE_VERSION +docker run -d --name $ORACLE_VERSION $DOCKER_OPTIONS -p 1521:1521 $DOCKHER_HUB_REPO:$ORACLE_VERSION docker logs -f $ORACLE_VERSION | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered \ No newline at end of file From 39b7e9bb0d05832e0852385d1df9c93db76b9359 Mon Sep 17 00:00:00 2001 From: Pazus Date: Wed, 26 Jul 2017 07:32:54 +0300 Subject: [PATCH 2/2] added ability to specify different image tag using build variables --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e96c9135..11e0e9fe2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,9 +42,9 @@ env: - UT3_DOCKER_REPO="utplsqlv3/oracledb" - DOCKHER_HUB_REPO="${DOCKER_BASE_TAG:-$UT3_DOCKER_REPO}" matrix: - - ORACLE_VERSION="11g-r2-xe" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g' - - ORACLE_VERSION="12c-r1-se2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" - - ORACLE_VERSION="12c-r2-se2" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" + - ORACLE_VERSION="${DOCKER_TAG_11G:-11g-r2-xe}" CONNECTION_STR='127.0.0.1:1521/XE' DOCKER_OPTIONS='--shm-size=1g' + - ORACLE_VERSION="${DOCKER_TAG_12C:-12c-r1-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" + - ORACLE_VERSION="${DOCKER_TAG_12C2:-12c-r2-se2}" CONNECTION_STR='127.0.0.1:1521/ORCLPDB1' DOCKER_OPTIONS="-v /dev/pdbs:/opt/oracle/oradata/pdbs" cache: pip: true