Skip to content

Commit b294bc3

Browse files
committed
Testing image build process.
1 parent 922ca71 commit b294bc3

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ env:
1010
- UTPLSQL_REPO="utPLSQL/utPLSQL"
1111
- ORACLE_PWD="oracle"
1212
- DOCKHER_HUB_REPO="utplsqlv3/oracledb"
13+
- BUILD_DIR=${TRAVIS_BUILD_DIR}
1314
- DOCKER_VOLUME="/home/oracle/host"
1415
- DOCKER_ENV="-e SQLCLI=sqlplus -e UT3_RELEASE_VERSION_SCHEMA -e UT3_TABLESPACE -e ORACLE_PWD -e CONNECTION_STR -e UTPLSQL_DIR"
1516
#utPLSQL released version directory
@@ -31,7 +32,7 @@ install:
3132
- unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli
3233
# Chmod is needed to allow for write access within from docker container volume
3334
- chmod -R go+w ./${UTPLSQL_DIR}/source
34-
- cd ${DOCKER_DIR} && pwd && .././travis/download.sh ${DOWNLOAD_NAME}
35+
- cd ${DOCKER_DIR} && ../.travis/download.sh ${DOWNLOAD_NAME}
3536

3637
script:
3738
- docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"

.travis/download.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#!/bin/bash
22
set -e
33

4+
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
5+
6+
47
if [ "$ORACLE_OTN_USER" == "" ] || [ "$ORACLE_OTN_PASSWORD" == "" ]; then
58
echo "Error: Oracle OTN username/password not specified."
69
exit 1
@@ -11,7 +14,7 @@ PRODUCT=""
1114
# Call the casperjs script to return the download url.
1215
# Then download the file using curl.
1316
downloadFile() {
14-
downloadUrl=$(exec casperjs download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2)
17+
downloadUrl=$(exec casperjs ${SCRIPT_DIR}/download.js $ORACLE_OTN_USER $ORACLE_OTN_PASSWORD $1 $2)
1518
downloadUrl=${downloadUrl%$'\r'}
1619
echo "DownloadURL: $downloadUrl"
1720
curl -o $3 -L "$downloadUrl"

0 commit comments

Comments
 (0)