Skip to content

Commit fd9c6fa

Browse files
committed
oci8: exclude META-INF, fix dir path
1 parent b3a2689 commit fd9c6fa

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

layers/oci8/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,24 @@ RUN yum install -y libaio
1414
RUN mkdir -p ${ORACLE_BUILD_DIR}; \
1515
cd ${ORACLE_BUILD_DIR}; \
1616
curl -o oci-basic.zip https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-basiclite-linux.x64-21.16.0.0.0dbru.zip && \
17-
unzip oci-basic.zip -d src && \
17+
unzip oci-basic.zip -d src -x META-INF/* && \
1818
curl -o oci-sdk.zip https://download.oracle.com/otn_software/linux/instantclient/2116000/instantclient-sdk-linux.x64-21.16.0.0.0dbru.zip && \
19-
unzip oci-sdk.zip -d src
19+
unzip oci-sdk.zip -d src -x META-INF/*
2020

2121
RUN if [ "$PHP_VERSION" = "80" ] ; then \
22-
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8-3.0.1; \
22+
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8-3.0.1; \
2323
elif [ "$PHP_VERSION" = "81" ] ; then \
24-
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8-3.2.1; \
24+
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8-3.2.1; \
2525
else \
26-
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_10" | pecl install oci8; \
26+
echo "instantclient,${ORACLE_BUILD_DIR}/src/instantclient_21_16" | pecl install oci8; \
2727
fi
2828

2929
RUN cp /usr/lib64/libaio.so.1 /tmp/libaio.so.1
30-
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libclntshcore.so.21.1 /tmp/libclntshcore.so.21.1
31-
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libclntsh.so.21.1 /tmp/libclntsh.so.21.1
32-
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libocci.so.21.1 /tmp/libocci.so.21.1
33-
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libnnz21.so /tmp/libnnz21.so
34-
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_10/libociicus.so /tmp/libociicus.so
30+
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libclntshcore.so.21.1 /tmp/libclntshcore.so.21.1
31+
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libclntsh.so.21.1 /tmp/libclntsh.so.21.1
32+
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libocci.so.21.1 /tmp/libocci.so.21.1
33+
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libnnz21.so /tmp/libnnz21.so
34+
RUN cp ${ORACLE_BUILD_DIR}/src/instantclient_21_16/libociicus.so /tmp/libociicus.so
3535
RUN cp `php-config --extension-dir`/oci8.so /tmp/oci8.so
3636
RUN echo 'extension=oci8.so' > /tmp/ext.ini
3737

0 commit comments

Comments
 (0)