diff --git a/Dockerfile b/Dockerfile index 72f5a8f..c9e1733 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # INSTALL PYTHON IMAGE -FROM python:3.6 +FROM python:3.7 MAINTAINER Peisheng Jiang # INSTALL TOOLS @@ -22,8 +22,9 @@ ENV OCI_LIB_DIR=/opt/oracle/instantclient ENV OCI_INCLUDE_DIR=/opt/oracle/instantclient/sdk/include # INSTALL INSTANTCLIENT AND DEPENDENCIES -RUN ./install-instantclient.sh \ - && pip install -r requirements.txt +RUN ["/bin/bash", "./install-instantclient.sh"] + +RUN pip install -r requirements.txt EXPOSE 5000 diff --git a/install-instantclient.sh b/install-instantclient.sh index 23f1228..c84cd25 100644 --- a/install-instantclient.sh +++ b/install-instantclient.sh @@ -1,9 +1,13 @@ #!/usr/bin/env bash -unzip instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle -unzip instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle -mv /opt/oracle/instantclient_12_1 /opt/oracle/instantclient -ln -s /opt/oracle/instantclient/libclntsh.so.12.1 /opt/oracle/instantclient/libclntsh.so -ln -s /opt/oracle/instantclient/libocci.so.12.1 /opt/oracle/instantclient/libocci.so +unzip instantclient-basic-linux.x64-19.6.0.0.0dbru.zip -d /opt/oracle +unzip instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip -d /opt/oracle +unzip instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip -d /opt/oracle +unzip instantclient-tools-linux.x64-19.6.0.0.0dbru.zip -d /opt/oracle + +rm -rf /opt/oracle/instantclient +mv /opt/oracle/instantclient_19_6 /opt/oracle/instantclient +ln -s /opt/oracle/instantclient/libclntsh.so.19.6 /opt/oracle/instantclient/libclntsh.so +ln -s /opt/oracle/instantclient/libocci.so.19.6 /opt/oracle/instantclient/libocci.so export ORACLE_HOME="/opt/oracle/instantclient" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME @@ -11,3 +15,4 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME export OCI_HOME="/opt/oracle/instantclient" export OCI_LIB_DIR="/opt/oracle/instantclient" export OCI_INCLUDE_DIR="/opt/oracle/instantclient/sdk/include" +export PATH=$PATH:$ORACLE_HOME \ No newline at end of file diff --git a/oracle-instantclient/instantclient-basic-linux.x64-12.1.0.2.0.zip b/oracle-instantclient/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip similarity index 74% rename from oracle-instantclient/instantclient-basic-linux.x64-12.1.0.2.0.zip rename to oracle-instantclient/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip index 5caca34..553b30b 100644 Binary files a/oracle-instantclient/instantclient-basic-linux.x64-12.1.0.2.0.zip and b/oracle-instantclient/instantclient-basic-linux.x64-19.6.0.0.0dbru.zip differ diff --git a/oracle-instantclient/instantclient-sdk-linux.x64-12.1.0.2.0.zip b/oracle-instantclient/instantclient-sdk-linux.x64-12.1.0.2.0.zip deleted file mode 100644 index 74e3ed1..0000000 Binary files a/oracle-instantclient/instantclient-sdk-linux.x64-12.1.0.2.0.zip and /dev/null differ diff --git a/oracle-instantclient/instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip b/oracle-instantclient/instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip new file mode 100644 index 0000000..9023985 Binary files /dev/null and b/oracle-instantclient/instantclient-sdk-linux.x64-19.6.0.0.0dbru.zip differ diff --git a/oracle-instantclient/instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip b/oracle-instantclient/instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip new file mode 100644 index 0000000..98a4395 Binary files /dev/null and b/oracle-instantclient/instantclient-sqlplus-linux.x64-19.6.0.0.0dbru.zip differ diff --git a/oracle-instantclient/instantclient-tools-linux.x64-19.6.0.0.0dbru.zip b/oracle-instantclient/instantclient-tools-linux.x64-19.6.0.0.0dbru.zip new file mode 100644 index 0000000..ec02b16 Binary files /dev/null and b/oracle-instantclient/instantclient-tools-linux.x64-19.6.0.0.0dbru.zip differ