From 5b7f087c61ca426e3dac2b373da4f36dec56ec52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Mar=C3=ADa=20Rinc=C3=B3n=20Mej=C3=ADas?= Date: Wed, 22 Apr 2020 13:20:30 +0200 Subject: [PATCH 1/2] Updated Oracle Instant Client version to 12.2 --- ubuntu/php-fpm-7.4/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ubuntu/php-fpm-7.4/Dockerfile b/ubuntu/php-fpm-7.4/Dockerfile index c712799..e0cd8bd 100644 --- a/ubuntu/php-fpm-7.4/Dockerfile +++ b/ubuntu/php-fpm-7.4/Dockerfile @@ -55,13 +55,13 @@ RUN apt-get update && apt-get install -y libxslt1-dev \ RUN apt-get update -yqq && \ apt-get -y install build-essential libaio1 alien -ENV LD_LIBRARY_PATH=/usr/lib/oracle/12.1/ -ENV LD_LIBRARY_PATH=/usr/lib/oracle/12.1/client64/lib/:$LD_LIBRARY_PATH +ENV LD_LIBRARY_PATH=/usr/lib/oracle/12.2/ +ENV LD_LIBRARY_PATH=/usr/lib/oracle/12.2/client64/lib/:$LD_LIBRARY_PATH -COPY oracle/oracle-instantclient12.1-basic_12.1.0.2.0-2_amd64.deb /tmp/oracle-instantclient12.1-basic_12.1.0.2.0-2_amd64.deb -COPY oracle/oracle-instantclient12.1-devel_12.1.0.2.0-2_amd64.deb /tmp/oracle-instantclient12.1-devel_12.1.0.2.0-2_amd64.deb -RUN dpkg -i /tmp/oracle-instantclient12.1-basic_12.1.0.2.0-2_amd64.deb -RUN dpkg -i /tmp/oracle-instantclient12.1-devel_12.1.0.2.0-2_amd64.deb +COPY oracle/oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm /tmp/oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm +COPY oracle/oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm /tmp/oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm +RUN alien -i /tmp/oracle-instantclient12.2-basic-12.2.0.1.0-1.x86_64.rpm +RUN alien -i /tmp/oracle-instantclient12.2-devel-12.2.0.1.0-1.x86_64.rpm # [A PECL release compatible with PHP 7 is pending](https://bugs.php.net/bug.php?id=71078) RUN curl https://pecl.php.net/get/oci8-2.2.0.tgz > /tmp/oci8.tgz \ From 0971574cd9bdaeaa4335d2324f9c0bc19ea1ae47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Mar=C3=ADa=20Rinc=C3=B3n=20Mej=C3=ADas?= Date: Wed, 22 Apr 2020 13:35:25 +0200 Subject: [PATCH 2/2] Added changes to Changelog and README --- Changelog.md | 5 +++++ ubuntu/README.md | 1 + 2 files changed, 6 insertions(+) diff --git a/Changelog.md b/Changelog.md index af0e8fa..248549b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ # Changelog +## Versión v1.0.1 + +### Changed +- Oracle Instant Client updated in php-fpm-7.4 Dockerfile. Now using version 12.2. + ## Versión v1.0.0 ### Added diff --git a/ubuntu/README.md b/ubuntu/README.md index eb0ff1d..f41e67b 100644 --- a/ubuntu/README.md +++ b/ubuntu/README.md @@ -20,6 +20,7 @@ PHP flavors: ~~PHP [5.6.32](php-fpm-5.6.32/README.md)~~ (not ready yet) PHP [7.1](php-fpm-7.1/README.md) PHP [7.2](php-fpm-7.2/README.md) + PHP [7.4](php-fpm-7.4/README.md) Images prepared to work with www-data user.