From f4951cb8f56114a7001e6aa6b5e626e05930b4f1 Mon Sep 17 00:00:00 2001 From: "DESK0253\\Leo" Date: Sat, 17 Oct 2020 00:06:52 +0800 Subject: [PATCH 1/2] feat: add ORACLE_INSTANT_CLIENT_MIRROR ARG --- env-example | 2 ++ php-fpm/Dockerfile | 5 +++-- workspace/Dockerfile | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/env-example b/env-example index 0d4ebe6c..f80d0f6c 100644 --- a/env-example +++ b/env-example @@ -76,6 +76,8 @@ COMPOSE_CONVERT_WINDOWS_PATHS=1 CHANGE_SOURCE=false # Set CHANGE_SOURCE and UBUNTU_SOURCE option if you want to change the Ubuntu system sources.list file. UBUNTU_SOURCE=aliyun +# Set ORACLE INSTANT_CLIENT_MIRROR option if you want to use Intranet improve download, you can download files first +ORACLE_INSTANT_CLIENT_MIRROR=http://192.168.0.42/downloads/oracle_instant_client/ ### Docker Sync ########################################### diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index d05426d3..2eac938b 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -489,6 +489,7 @@ RUN set -xe; \ ########################################################################### ARG INSTALL_OCI8=false +ARG ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/ ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1" ENV OCI_HOME="/opt/oracle/instantclient_12_1" @@ -502,8 +503,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ # Install Oracle Instantclient && mkdir /opt/oracle \ && cd /opt/oracle \ - && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-basic-linux.x64-12.1.0.2.0.zip \ - && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-sdk-linux.x64-12.1.0.2.0.zip \ + && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-basic-linux.x64-12.1.0.2.0.zip \ + && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-sdk-linux.x64-12.1.0.2.0.zip \ && unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \ && unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \ && ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \ diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 6d059bac..5b417b30 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -829,6 +829,7 @@ RUN set -xe; \ USER root ARG INSTALL_OCI8=false +ARG ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/ ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1" ENV OCI_HOME="/opt/oracle/instantclient_12_1" @@ -842,8 +843,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \ # Install Oracle Instantclient && mkdir /opt/oracle \ && cd /opt/oracle \ - && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-basic-linux.x64-12.1.0.2.0.zip \ - && wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-sdk-linux.x64-12.1.0.2.0.zip \ + && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-basic-linux.x64-12.1.0.2.0.zip \ + && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-sdk-linux.x64-12.1.0.2.0.zip \ && unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \ && unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \ && ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \ From 36761faae0c5d146f31997251fac286d2dbb11db Mon Sep 17 00:00:00 2001 From: "DESK0253\\Leo" Date: Fri, 18 Dec 2020 12:34:21 +0800 Subject: [PATCH 2/2] fix: fix ORACLE_INSTANT_CLIENT_MIRROR default value --- env-example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env-example b/env-example index f80d0f6c..a70d2eea 100644 --- a/env-example +++ b/env-example @@ -77,7 +77,7 @@ CHANGE_SOURCE=false # Set CHANGE_SOURCE and UBUNTU_SOURCE option if you want to change the Ubuntu system sources.list file. UBUNTU_SOURCE=aliyun # Set ORACLE INSTANT_CLIENT_MIRROR option if you want to use Intranet improve download, you can download files first -ORACLE_INSTANT_CLIENT_MIRROR=http://192.168.0.42/downloads/oracle_instant_client/ +ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/ ### Docker Sync ###########################################