Skip to content

Commit f73b8fb

Browse files
authored
Merge pull request laradock#2744 from leowangxp/oracle_instant_client_mirror
feat: add ORACLE_INSTANT_CLIENT_MIRROR ARG
2 parents 1b102f4 + 36761fa commit f73b8fb

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

env-example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ COMPOSE_CONVERT_WINDOWS_PATHS=1
7676
CHANGE_SOURCE=false
7777
# Set CHANGE_SOURCE and UBUNTU_SOURCE option if you want to change the Ubuntu system sources.list file.
7878
UBUNTU_SOURCE=aliyun
79+
# Set ORACLE INSTANT_CLIENT_MIRROR option if you want to use Intranet improve download, you can download files first
80+
ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/
7981

8082
### Docker Sync ###########################################
8183

php-fpm/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ RUN set -xe; \
490490
###########################################################################
491491

492492
ARG INSTALL_OCI8=false
493+
ARG ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/
493494

494495
ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1"
495496
ENV OCI_HOME="/opt/oracle/instantclient_12_1"
@@ -503,8 +504,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
503504
# Install Oracle Instantclient
504505
&& mkdir /opt/oracle \
505506
&& cd /opt/oracle \
506-
&& wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-basic-linux.x64-12.1.0.2.0.zip \
507-
&& wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-sdk-linux.x64-12.1.0.2.0.zip \
507+
&& wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-basic-linux.x64-12.1.0.2.0.zip \
508+
&& wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-sdk-linux.x64-12.1.0.2.0.zip \
508509
&& unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
509510
&& unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
510511
&& ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \

workspace/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -865,6 +865,7 @@ RUN set -xe; \
865865

866866
USER root
867867
ARG INSTALL_OCI8=false
868+
ARG ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/
868869

869870
ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1"
870871
ENV OCI_HOME="/opt/oracle/instantclient_12_1"
@@ -878,8 +879,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
878879
# Install Oracle Instantclient
879880
&& mkdir /opt/oracle \
880881
&& cd /opt/oracle \
881-
&& wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-basic-linux.x64-12.1.0.2.0.zip \
882-
&& wget https://github.com/diogomascarenha/oracle-instantclient/raw/master/instantclient-sdk-linux.x64-12.1.0.2.0.zip \
882+
&& wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-basic-linux.x64-12.1.0.2.0.zip \
883+
&& wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-sdk-linux.x64-12.1.0.2.0.zip \
883884
&& unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
884885
&& unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
885886
&& ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \

0 commit comments

Comments
 (0)