From 4b92ee8ef9331502e4ae31ad8080e1e7f933c36a Mon Sep 17 00:00:00 2001 From: Lucas Macedo Date: Wed, 12 Jun 2024 13:09:21 -0300 Subject: [PATCH 1/9] Add PHP 8.2 and 8.3 Suport --- 8.2-nginx-oci8-prod/Dockerfile | 21 ++++++ 8.2-nginx-oci8/Dockerfile | 21 ++++++ 8.2-nginx-swoole-oci8-prod/Dockerfile | 21 ++++++ 8.2-nginx-swoole-oci8/Dockerfile | 21 ++++++ 8.3-nginx-oci8-prod/Dockerfile | 21 ++++++ 8.3-nginx-oci8/Dockerfile | 21 ++++++ 8.3-nginx-swoole-oci8-prod/Dockerfile | 21 ++++++ 8.3-nginx-swoole-oci8/Dockerfile | 21 ++++++ fwd-template.json | 96 +++++++++++++++++++++++++++ 9 files changed, 264 insertions(+) create mode 100644 8.2-nginx-oci8-prod/Dockerfile create mode 100644 8.2-nginx-oci8/Dockerfile create mode 100644 8.2-nginx-swoole-oci8-prod/Dockerfile create mode 100644 8.2-nginx-swoole-oci8/Dockerfile create mode 100644 8.3-nginx-oci8-prod/Dockerfile create mode 100644 8.3-nginx-oci8/Dockerfile create mode 100644 8.3-nginx-swoole-oci8-prod/Dockerfile create mode 100644 8.3-nginx-swoole-oci8/Dockerfile diff --git a/8.2-nginx-oci8-prod/Dockerfile b/8.2-nginx-oci8-prod/Dockerfile new file mode 100644 index 0000000..62303c4 --- /dev/null +++ b/8.2-nginx-oci8-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.2-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.2-nginx-oci8/Dockerfile b/8.2-nginx-oci8/Dockerfile new file mode 100644 index 0000000..3afbecc --- /dev/null +++ b/8.2-nginx-oci8/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.2-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.2-nginx-swoole-oci8-prod/Dockerfile b/8.2-nginx-swoole-oci8-prod/Dockerfile new file mode 100644 index 0000000..0ea8048 --- /dev/null +++ b/8.2-nginx-swoole-oci8-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.2-nginx-swoole-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.2-nginx-swoole-oci8/Dockerfile b/8.2-nginx-swoole-oci8/Dockerfile new file mode 100644 index 0000000..dd5376c --- /dev/null +++ b/8.2-nginx-swoole-oci8/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.2-nginx-swoole + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.3-nginx-oci8-prod/Dockerfile b/8.3-nginx-oci8-prod/Dockerfile new file mode 100644 index 0000000..8b5bd46 --- /dev/null +++ b/8.3-nginx-oci8-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.3-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.3-nginx-oci8/Dockerfile b/8.3-nginx-oci8/Dockerfile new file mode 100644 index 0000000..96e14d2 --- /dev/null +++ b/8.3-nginx-oci8/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.3-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.3-nginx-swoole-oci8-prod/Dockerfile b/8.3-nginx-swoole-oci8-prod/Dockerfile new file mode 100644 index 0000000..8609386 --- /dev/null +++ b/8.3-nginx-swoole-oci8-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.3-nginx-swoole-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.3-nginx-swoole-oci8/Dockerfile b/8.3-nginx-swoole-oci8/Dockerfile new file mode 100644 index 0000000..e34d27b --- /dev/null +++ b/8.3-nginx-swoole-oci8/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.3-nginx-swoole + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/fwd-template.json b/fwd-template.json index cdf9076..455f97c 100644 --- a/fwd-template.json +++ b/fwd-template.json @@ -120,6 +120,102 @@ "path": "template/Dockerfile" } ] + }, + { + "name": "8.2-nginx-oci8-prod", + "data": { + "from": "kooldev/php:8.2-nginx-prod" + }, + "files": [ + { + "name": "Dockerfile", + "path": "template/Dockerfile" + } + ] + }, + { + "name": "8.2-nginx-oci8", + "data": { + "from": "kooldev/php:8.2-nginx" + }, + "files": [ + { + "name": "Dockerfile", + "path": "template/Dockerfile" + } + ] + }, + { + "name": "8.2-nginx-swoole-oci8-prod", + "data": { + "from": "kooldev/php:8.2-nginx-swoole-prod" + }, + "files": [ + { + "name": "Dockerfile", + "path": "template/Dockerfile" + } + ] + }, + { + "name": "8.2-nginx-swoole-oci8", + "data": { + "from": "kooldev/php:8.2-nginx-swoole" + }, + "files": [ + { + "name": "Dockerfile", + "path": "template/Dockerfile" + } + ] + }, + { + "name": "8.3-nginx-oci8-prod", + "data": { + "from": "kooldev/php:8.3-nginx-prod" + }, + "files": [ + { + "name": "Dockerfile", + "path": "template/Dockerfile" + } + ] + }, + { + "name": "8.3-nginx-oci8", + "data": { + "from": "kooldev/php:8.3-nginx" + }, + "files": [ + { + "name": "Dockerfile", + "path": "template/Dockerfile" + } + ] + }, + { + "name": "8.3-nginx-swoole-oci8-prod", + "data": { + "from": "kooldev/php:8.3-nginx-swoole-prod" + }, + "files": [ + { + "name": "Dockerfile", + "path": "template/Dockerfile" + } + ] + }, + { + "name": "8.3-nginx-swoole-oci8", + "data": { + "from": "kooldev/php:8.3-nginx-swoole" + }, + "files": [ + { + "name": "Dockerfile", + "path": "template/Dockerfile" + } + ] } ] } From 6b084381dd7ccf536becb6600f6319fd2619148d Mon Sep 17 00:00:00 2001 From: Lucas Macedo Date: Wed, 12 Jun 2024 13:13:35 -0300 Subject: [PATCH 2/9] Update README for PHP 8.2 and 8.3 Suport --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/README.md b/README.md index 46465c7..42d88f4 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,26 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl ## Available Tags +### 8.3 + +- [8.3-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-oci8/Dockerfile) +- [8.3-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-oci8-prod/Dockerfile) + +### 8.3 with Swoole + +- [8.3-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-swoole-oci8/Dockerfile) +- [8.3-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-swoole-oci8-prod/Dockerfile) + +### 8.2 + +- [8.2-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-oci8/Dockerfile) +- [8.2-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-oci8-prod/Dockerfile) + +### 8.2 with Swoole + +- [8.2-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-swoole-oci8/Dockerfile) +- [8.2-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-swoole-oci8-prod/Dockerfile) + ### 8.1 - [8.1-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-oci8/Dockerfile) From 87999d2253d4f7b6cb262fcf303e06c56c943410 Mon Sep 17 00:00:00 2001 From: Lucas Macedo Date: Wed, 12 Jun 2024 13:54:58 -0300 Subject: [PATCH 3/9] Add Tags for Support PHP 8.2 and 8.3 --- .github/workflows/ci-cd.yml | 2 +- kool.yml | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index fd0efa0..b2bddee 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['7.4', '8.0', '8.1'] + version: ['7.4', '8.0', '8.1', '8.2', '8.3'] steps: - name: Checkout code diff --git a/kool.yml b/kool.yml index ff0668d..cfe7f37 100644 --- a/kool.yml +++ b/kool.yml @@ -13,3 +13,14 @@ scripts: - docker build --pull -t kooldev/php:8.1-nginx-oci8-prod 8.1-nginx-oci8-prod - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8 8.1-nginx-swoole-oci8 - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8-prod 8.1-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8-prod 8.1-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.2-nginx-oci8 8.2-nginx-oci8 + - docker build --pull -t kooldev/php:8.2-nginx-oci8-prod 8.2-nginx-oci8-prod + - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8 8.2-nginx-swoole-oci8 + - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8-prod 8.2-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8-prod 8.2-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.3-nginx-oci8 8.3-nginx-oci8 + - docker build --pull -t kooldev/php:8.3-nginx-oci8-prod 8.3-nginx-oci8-prod + - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8 8.3-nginx-swoole-oci8 + - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8-prod 8.3-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8-prod 8.3-nginx-swoole-oci8-prod From 64fca47aefbfdf469eaf745b67a0a4f9f7271bb2 Mon Sep 17 00:00:00 2001 From: Lucas Macedo Date: Wed, 12 Jun 2024 14:04:09 -0300 Subject: [PATCH 4/9] Fix fw-tempalte nginx-swoole to swoole-nginx --- fwd-template.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fwd-template.json b/fwd-template.json index 455f97c..51ddc2b 100644 --- a/fwd-template.json +++ b/fwd-template.json @@ -52,7 +52,7 @@ { "name": "8.0-nginx-swoole-oci8-prod", "data": { - "from": "kooldev/php:8.0-nginx-swoole-prod" + "from": "kooldev/php:8.0-swoole-nginx-prod" }, "files": [ { @@ -64,7 +64,7 @@ { "name": "8.0-nginx-swoole-oci8", "data": { - "from": "kooldev/php:8.0-nginx-swoole" + "from": "kooldev/php:8.0-swoole-nginx" }, "files": [ { @@ -100,7 +100,7 @@ { "name": "8.1-nginx-swoole-oci8-prod", "data": { - "from": "kooldev/php:8.1-nginx-swoole-prod" + "from": "kooldev/php:8.1-swoole-nginx-prod" }, "files": [ { @@ -112,7 +112,7 @@ { "name": "8.1-nginx-swoole-oci8", "data": { - "from": "kooldev/php:8.1-nginx-swoole" + "from": "kooldev/php:8.1-swoole-nginx" }, "files": [ { @@ -148,7 +148,7 @@ { "name": "8.2-nginx-swoole-oci8-prod", "data": { - "from": "kooldev/php:8.2-nginx-swoole-prod" + "from": "kooldev/php:8.2-swoole-nginx-prod" }, "files": [ { @@ -160,7 +160,7 @@ { "name": "8.2-nginx-swoole-oci8", "data": { - "from": "kooldev/php:8.2-nginx-swoole" + "from": "kooldev/php:8.2-swoole-nginx" }, "files": [ { @@ -196,7 +196,7 @@ { "name": "8.3-nginx-swoole-oci8-prod", "data": { - "from": "kooldev/php:8.3-nginx-swoole-prod" + "from": "kooldev/php:8.3-swoole-nginx-prod" }, "files": [ { @@ -208,7 +208,7 @@ { "name": "8.3-nginx-swoole-oci8", "data": { - "from": "kooldev/php:8.3-nginx-swoole" + "from": "kooldev/php:8.3-swoole-nginx" }, "files": [ { From 5d44130844ac48395f6f0995275dbc02da612ee3 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 9 Jul 2024 14:29:21 -0300 Subject: [PATCH 5/9] Fix Build | Deprecate 7.4 --- 7.4-nginx-oci8-prod/Dockerfile | 21 ------------------ 7.4-nginx-oci8/Dockerfile | 21 ------------------ fwd-template.json | 40 +++++++--------------------------- 3 files changed, 8 insertions(+), 74 deletions(-) delete mode 100644 7.4-nginx-oci8-prod/Dockerfile delete mode 100644 7.4-nginx-oci8/Dockerfile diff --git a/7.4-nginx-oci8-prod/Dockerfile b/7.4-nginx-oci8-prod/Dockerfile deleted file mode 100644 index 5edd0f0..0000000 --- a/7.4-nginx-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:7.4-nginx-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/7.4-nginx-oci8/Dockerfile b/7.4-nginx-oci8/Dockerfile deleted file mode 100644 index 6f4d7e4..0000000 --- a/7.4-nginx-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:7.4-nginx - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/fwd-template.json b/fwd-template.json index 51ddc2b..f7693eb 100644 --- a/fwd-template.json +++ b/fwd-template.json @@ -1,30 +1,6 @@ { "output": ".", "builds": [ - { - "name": "7.4-nginx-oci8", - "data": { - "from": "kooldev/php:7.4-nginx" - }, - "files": [ - { - "name": "Dockerfile", - "path": "template/Dockerfile" - } - ] - }, - { - "name": "7.4-nginx-oci8-prod", - "data": { - "from": "kooldev/php:7.4-nginx-prod" - }, - "files": [ - { - "name": "Dockerfile", - "path": "template/Dockerfile" - } - ] - }, { "name": "8.0-nginx-oci8-prod", "data": { @@ -52,7 +28,7 @@ { "name": "8.0-nginx-swoole-oci8-prod", "data": { - "from": "kooldev/php:8.0-swoole-nginx-prod" + "from": "kooldev/php:8.0-nginx-swoole-prod" }, "files": [ { @@ -64,7 +40,7 @@ { "name": "8.0-nginx-swoole-oci8", "data": { - "from": "kooldev/php:8.0-swoole-nginx" + "from": "kooldev/php:8.0-nginx-swoole" }, "files": [ { @@ -100,7 +76,7 @@ { "name": "8.1-nginx-swoole-oci8-prod", "data": { - "from": "kooldev/php:8.1-swoole-nginx-prod" + "from": "kooldev/php:8.1-nginx-swoole-prod" }, "files": [ { @@ -112,7 +88,7 @@ { "name": "8.1-nginx-swoole-oci8", "data": { - "from": "kooldev/php:8.1-swoole-nginx" + "from": "kooldev/php:8.1-nginx-swoole" }, "files": [ { @@ -148,7 +124,7 @@ { "name": "8.2-nginx-swoole-oci8-prod", "data": { - "from": "kooldev/php:8.2-swoole-nginx-prod" + "from": "kooldev/php:8.2-nginx-swoole-prod" }, "files": [ { @@ -160,7 +136,7 @@ { "name": "8.2-nginx-swoole-oci8", "data": { - "from": "kooldev/php:8.2-swoole-nginx" + "from": "kooldev/php:8.2-nginx-swoole" }, "files": [ { @@ -196,7 +172,7 @@ { "name": "8.3-nginx-swoole-oci8-prod", "data": { - "from": "kooldev/php:8.3-swoole-nginx-prod" + "from": "kooldev/php:8.3-nginx-swoole-prod" }, "files": [ { @@ -208,7 +184,7 @@ { "name": "8.3-nginx-swoole-oci8", "data": { - "from": "kooldev/php:8.3-swoole-nginx" + "from": "kooldev/php:8.3-nginx-swoole" }, "files": [ { From 4b7f3a5ba07bfa52cbf1f39d89c595c19e6e3976 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 9 Jul 2024 14:35:25 -0300 Subject: [PATCH 6/9] tweak --- .github/workflows/ci-cd.yml | 11 +---------- kool.yml | 2 -- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index b2bddee..95458bc 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - version: ['7.4', '8.0', '8.1', '8.2', '8.3'] + version: ['8.0', '8.1', '8.2', '8.3'] steps: - name: Checkout code @@ -22,9 +22,6 @@ jobs: docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8 ${{ matrix.version }}-nginx-oci8 docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8-prod ${{ matrix.version }}-nginx-oci8-prod - - name: Build Swoole - if: matrix.version != '7.4' - run: | docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 ${{ matrix.version }}-nginx-swoole-oci8 docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod ${{ matrix.version }}-nginx-swoole-oci8-prod @@ -33,9 +30,6 @@ jobs: docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);" docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);" - - name: Tests Swoole - if: matrix.version != '7.4' - run: | docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);" docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);" @@ -55,8 +49,5 @@ jobs: docker push kooldev/php:${{ matrix.version }}-nginx-oci8 docker push kooldev/php:${{ matrix.version }}-nginx-oci8-prod - - name: Push to DockerHub Swoole - if: github.ref == 'refs/heads/main' && github.repository == 'kool-dev/docker-php-oci8' && matrix.version != '7.4' - run: | docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod diff --git a/kool.yml b/kool.yml index cfe7f37..d3e99c4 100644 --- a/kool.yml +++ b/kool.yml @@ -3,8 +3,6 @@ scripts: - kool docker fireworkweb/fwd:v1.0 fwd template build: - kool run template - - docker build --pull -t kooldev/php:7.4-nginx-oci8 7.4-nginx-oci8 - - docker build --pull -t kooldev/php:7.4-nginx-oci8-prod 7.4-nginx-oci8-prod - docker build --pull -t kooldev/php:8.0-nginx-oci8 8.0-nginx-oci8 - docker build --pull -t kooldev/php:8.0-nginx-oci8-prod 8.0-nginx-oci8-prod - docker build --pull -t kooldev/php:8.0-nginx-swoole-oci8 8.0-nginx-swoole-oci8 From 8c281dc92d806680bc60bcf9715b548003b8327e Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 9 Jul 2024 14:38:44 -0300 Subject: [PATCH 7/9] Fix --- .github/workflows/ci-cd.yml | 12 +++++----- 8.0-nginx-oci8-prod/Dockerfile | 21 ------------------ 8.0-nginx-oci8/Dockerfile | 21 ------------------ 8.0-nginx-swoole-oci8-prod/Dockerfile | 21 ------------------ 8.0-nginx-swoole-oci8/Dockerfile | 21 ------------------ 8.1-nginx-oci8-prod/Dockerfile | 21 ------------------ 8.1-nginx-oci8/Dockerfile | 21 ------------------ 8.1-nginx-swoole-oci8-prod/Dockerfile | 21 ------------------ 8.1-nginx-swoole-oci8/Dockerfile | 21 ------------------ 8.2-nginx-oci8-prod/Dockerfile | 21 ------------------ 8.2-nginx-oci8/Dockerfile | 21 ------------------ 8.2-nginx-swoole-oci8-prod/Dockerfile | 21 ------------------ 8.2-nginx-swoole-oci8/Dockerfile | 21 ------------------ 8.3-nginx-oci8-prod/Dockerfile | 21 ------------------ 8.3-nginx-oci8/Dockerfile | 21 ------------------ 8.3-nginx-swoole-oci8-prod/Dockerfile | 21 ------------------ 8.3-nginx-swoole-oci8/Dockerfile | 21 ------------------ README.md | 16 +++++++------- fwd-template.json | 32 +++++++++++++-------------- kool.yml | 22 +++++++++--------- 20 files changed, 41 insertions(+), 377 deletions(-) delete mode 100644 8.0-nginx-oci8-prod/Dockerfile delete mode 100644 8.0-nginx-oci8/Dockerfile delete mode 100644 8.0-nginx-swoole-oci8-prod/Dockerfile delete mode 100644 8.0-nginx-swoole-oci8/Dockerfile delete mode 100644 8.1-nginx-oci8-prod/Dockerfile delete mode 100644 8.1-nginx-oci8/Dockerfile delete mode 100644 8.1-nginx-swoole-oci8-prod/Dockerfile delete mode 100644 8.1-nginx-swoole-oci8/Dockerfile delete mode 100644 8.2-nginx-oci8-prod/Dockerfile delete mode 100644 8.2-nginx-oci8/Dockerfile delete mode 100644 8.2-nginx-swoole-oci8-prod/Dockerfile delete mode 100644 8.2-nginx-swoole-oci8/Dockerfile delete mode 100644 8.3-nginx-oci8-prod/Dockerfile delete mode 100644 8.3-nginx-oci8/Dockerfile delete mode 100644 8.3-nginx-swoole-oci8-prod/Dockerfile delete mode 100644 8.3-nginx-swoole-oci8/Dockerfile diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 95458bc..a9776c3 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -22,8 +22,8 @@ jobs: docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8 ${{ matrix.version }}-nginx-oci8 docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8-prod ${{ matrix.version }}-nginx-oci8-prod - docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 ${{ matrix.version }}-nginx-swoole-oci8 - docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod ${{ matrix.version }}-nginx-swoole-oci8-prod + docker build --pull -t kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 ${{ matrix.version }}-swoole-nginx-oci8 + docker build --pull -t kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod ${{ matrix.version }}-swoole-nginx-oci8-prod - name: Tests run: | @@ -33,8 +33,8 @@ jobs: docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);" docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);" - docker run kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 php -r "extension_loaded('oci8') or die(1);" - docker run kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod php -r "extension_loaded('oci8') or die(1);" + docker run kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 php -r "extension_loaded('oci8') or die(1);" + docker run kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);" - name: Login to DockerHub uses: docker/login-action@v2.1.0 @@ -49,5 +49,5 @@ jobs: docker push kooldev/php:${{ matrix.version }}-nginx-oci8 docker push kooldev/php:${{ matrix.version }}-nginx-oci8-prod - docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 - docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod + docker push kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 + docker push kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod diff --git a/8.0-nginx-oci8-prod/Dockerfile b/8.0-nginx-oci8-prod/Dockerfile deleted file mode 100644 index 0e9a574..0000000 --- a/8.0-nginx-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.0-nginx-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.0-nginx-oci8/Dockerfile b/8.0-nginx-oci8/Dockerfile deleted file mode 100644 index ee39086..0000000 --- a/8.0-nginx-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.0-nginx - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.0-nginx-swoole-oci8-prod/Dockerfile b/8.0-nginx-swoole-oci8-prod/Dockerfile deleted file mode 100644 index 777d325..0000000 --- a/8.0-nginx-swoole-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.0-nginx-swoole-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.0-nginx-swoole-oci8/Dockerfile b/8.0-nginx-swoole-oci8/Dockerfile deleted file mode 100644 index 8c9997a..0000000 --- a/8.0-nginx-swoole-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.0-nginx-swoole - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.1-nginx-oci8-prod/Dockerfile b/8.1-nginx-oci8-prod/Dockerfile deleted file mode 100644 index 5b3b242..0000000 --- a/8.1-nginx-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.1-nginx-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.1-nginx-oci8/Dockerfile b/8.1-nginx-oci8/Dockerfile deleted file mode 100644 index e441486..0000000 --- a/8.1-nginx-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.1-nginx - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.1-nginx-swoole-oci8-prod/Dockerfile b/8.1-nginx-swoole-oci8-prod/Dockerfile deleted file mode 100644 index decd20f..0000000 --- a/8.1-nginx-swoole-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.1-nginx-swoole-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.1-nginx-swoole-oci8/Dockerfile b/8.1-nginx-swoole-oci8/Dockerfile deleted file mode 100644 index f51e8ca..0000000 --- a/8.1-nginx-swoole-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.1-nginx-swoole - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.2-nginx-oci8-prod/Dockerfile b/8.2-nginx-oci8-prod/Dockerfile deleted file mode 100644 index 62303c4..0000000 --- a/8.2-nginx-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.2-nginx-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.2-nginx-oci8/Dockerfile b/8.2-nginx-oci8/Dockerfile deleted file mode 100644 index 3afbecc..0000000 --- a/8.2-nginx-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.2-nginx - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.2-nginx-swoole-oci8-prod/Dockerfile b/8.2-nginx-swoole-oci8-prod/Dockerfile deleted file mode 100644 index 0ea8048..0000000 --- a/8.2-nginx-swoole-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.2-nginx-swoole-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.2-nginx-swoole-oci8/Dockerfile b/8.2-nginx-swoole-oci8/Dockerfile deleted file mode 100644 index dd5376c..0000000 --- a/8.2-nginx-swoole-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.2-nginx-swoole - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.3-nginx-oci8-prod/Dockerfile b/8.3-nginx-oci8-prod/Dockerfile deleted file mode 100644 index 8b5bd46..0000000 --- a/8.3-nginx-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.3-nginx-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.3-nginx-oci8/Dockerfile b/8.3-nginx-oci8/Dockerfile deleted file mode 100644 index 96e14d2..0000000 --- a/8.3-nginx-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.3-nginx - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.3-nginx-swoole-oci8-prod/Dockerfile b/8.3-nginx-swoole-oci8-prod/Dockerfile deleted file mode 100644 index 8609386..0000000 --- a/8.3-nginx-swoole-oci8-prod/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.3-nginx-swoole-prod - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/8.3-nginx-swoole-oci8/Dockerfile b/8.3-nginx-swoole-oci8/Dockerfile deleted file mode 100644 index e34d27b..0000000 --- a/8.3-nginx-swoole-oci8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM kooldev/php:8.3-nginx-swoole - -ENV LD_LIBRARY_PATH /usr/local/instantclient -ENV ORACLE_HOME /usr/local/instantclient - -# Download and unarchive Instant Client v11 -RUN apk add --update libaio libnsl && \ - curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ - curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ - unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ - unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ - ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ - ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ - ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ - ln -s ${ORACLE_HOME}/lib* /usr/lib && \ - ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ - ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ - docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ - docker-php-ext-install oci8 diff --git a/README.md b/README.md index 42d88f4..c66db62 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl ### 8.3 with Swoole -- [8.3-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-swoole-oci8/Dockerfile) -- [8.3-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-swoole-oci8-prod/Dockerfile) +- [8.3-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-swoole-nginx-oci8/Dockerfile) +- [8.3-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-swoole-nginx-oci8-prod/Dockerfile) ### 8.2 @@ -23,8 +23,8 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl ### 8.2 with Swoole -- [8.2-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-swoole-oci8/Dockerfile) -- [8.2-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-swoole-oci8-prod/Dockerfile) +- [8.2-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-swoole-nginx-oci8/Dockerfile) +- [8.2-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-swoole-nginx-oci8-prod/Dockerfile) ### 8.1 @@ -33,8 +33,8 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl ### 8.1 with Swoole -- [8.1-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-swoole-oci8/Dockerfile) -- [8.1-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-swoole-oci8-prod/Dockerfile) +- [8.1-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-swoole-nginx-oci8/Dockerfile) +- [8.1-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-swoole-nginx-oci8-prod/Dockerfile) ### 8.0 @@ -43,8 +43,8 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl ### 8.0 with Swoole -- [8.0-nginx-swoole-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-nginx-swoole-oci8/Dockerfile) -- [8.0-nginx-swoole-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-nginx-swoole-oci8-prod/Dockerfile) +- [8.0-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-swoole-nginx-oci8/Dockerfile) +- [8.0-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-swoole-nginx-oci8-prod/Dockerfile) There are also older versions available like [7.4-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-nginx-oci8/Dockerfile), [7.4-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-nginx-oci8-prod/Dockerfile). diff --git a/fwd-template.json b/fwd-template.json index f7693eb..98c797f 100644 --- a/fwd-template.json +++ b/fwd-template.json @@ -26,9 +26,9 @@ ] }, { - "name": "8.0-nginx-swoole-oci8-prod", + "name": "8.0-swoole-nginx-oci8-prod", "data": { - "from": "kooldev/php:8.0-nginx-swoole-prod" + "from": "kooldev/php:8.0-swoole-nginx-prod" }, "files": [ { @@ -38,9 +38,9 @@ ] }, { - "name": "8.0-nginx-swoole-oci8", + "name": "8.0-swoole-nginx-oci8", "data": { - "from": "kooldev/php:8.0-nginx-swoole" + "from": "kooldev/php:8.0-swoole-nginx" }, "files": [ { @@ -74,9 +74,9 @@ ] }, { - "name": "8.1-nginx-swoole-oci8-prod", + "name": "8.1-swoole-nginx-oci8-prod", "data": { - "from": "kooldev/php:8.1-nginx-swoole-prod" + "from": "kooldev/php:8.1-swoole-nginx-prod" }, "files": [ { @@ -86,9 +86,9 @@ ] }, { - "name": "8.1-nginx-swoole-oci8", + "name": "8.1-swoole-nginx-oci8", "data": { - "from": "kooldev/php:8.1-nginx-swoole" + "from": "kooldev/php:8.1-swoole-nginx" }, "files": [ { @@ -122,9 +122,9 @@ ] }, { - "name": "8.2-nginx-swoole-oci8-prod", + "name": "8.2-swoole-nginx-oci8-prod", "data": { - "from": "kooldev/php:8.2-nginx-swoole-prod" + "from": "kooldev/php:8.2-swoole-nginx-prod" }, "files": [ { @@ -134,9 +134,9 @@ ] }, { - "name": "8.2-nginx-swoole-oci8", + "name": "8.2-swoole-nginx-oci8", "data": { - "from": "kooldev/php:8.2-nginx-swoole" + "from": "kooldev/php:8.2-swoole-nginx" }, "files": [ { @@ -170,9 +170,9 @@ ] }, { - "name": "8.3-nginx-swoole-oci8-prod", + "name": "8.3-swoole-nginx-oci8-prod", "data": { - "from": "kooldev/php:8.3-nginx-swoole-prod" + "from": "kooldev/php:8.3-swoole-nginx-prod" }, "files": [ { @@ -182,9 +182,9 @@ ] }, { - "name": "8.3-nginx-swoole-oci8", + "name": "8.3-swoole-nginx-oci8", "data": { - "from": "kooldev/php:8.3-nginx-swoole" + "from": "kooldev/php:8.3-swoole-nginx" }, "files": [ { diff --git a/kool.yml b/kool.yml index d3e99c4..9788033 100644 --- a/kool.yml +++ b/kool.yml @@ -5,20 +5,20 @@ scripts: - kool run template - docker build --pull -t kooldev/php:8.0-nginx-oci8 8.0-nginx-oci8 - docker build --pull -t kooldev/php:8.0-nginx-oci8-prod 8.0-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.0-nginx-swoole-oci8 8.0-nginx-swoole-oci8 - - docker build --pull -t kooldev/php:8.0-nginx-swoole-oci8-prod 8.0-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.0-swoole-nginx-oci8 8.0-swoole-nginx-oci8 + - docker build --pull -t kooldev/php:8.0-swoole-nginx-oci8-prod 8.0-swoole-nginx-oci8-prod - docker build --pull -t kooldev/php:8.1-nginx-oci8 8.1-nginx-oci8 - docker build --pull -t kooldev/php:8.1-nginx-oci8-prod 8.1-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8 8.1-nginx-swoole-oci8 - - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8-prod 8.1-nginx-swoole-oci8-prod - - docker build --pull -t kooldev/php:8.1-nginx-swoole-oci8-prod 8.1-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8 8.1-swoole-nginx-oci8 + - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8-prod 8.1-swoole-nginx-oci8-prod + - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8-prod 8.1-swoole-nginx-oci8-prod - docker build --pull -t kooldev/php:8.2-nginx-oci8 8.2-nginx-oci8 - docker build --pull -t kooldev/php:8.2-nginx-oci8-prod 8.2-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8 8.2-nginx-swoole-oci8 - - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8-prod 8.2-nginx-swoole-oci8-prod - - docker build --pull -t kooldev/php:8.2-nginx-swoole-oci8-prod 8.2-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8 8.2-swoole-nginx-oci8 + - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8-prod 8.2-swoole-nginx-oci8-prod + - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8-prod 8.2-swoole-nginx-oci8-prod - docker build --pull -t kooldev/php:8.3-nginx-oci8 8.3-nginx-oci8 - docker build --pull -t kooldev/php:8.3-nginx-oci8-prod 8.3-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8 8.3-nginx-swoole-oci8 - - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8-prod 8.3-nginx-swoole-oci8-prod - - docker build --pull -t kooldev/php:8.3-nginx-swoole-oci8-prod 8.3-nginx-swoole-oci8-prod + - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8 8.3-swoole-nginx-oci8 + - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8-prod 8.3-swoole-nginx-oci8-prod + - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8-prod 8.3-swoole-nginx-oci8-prod From b9acad9023c645eb976697c2e8452eab967fd859 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 9 Jul 2024 14:50:58 -0300 Subject: [PATCH 8/9] wip --- .github/workflows/ci-cd.yml | 28 +++++++++++----------- 8.0-oci8-nginx-prod/Dockerfile | 21 +++++++++++++++++ 8.0-oci8-nginx/Dockerfile | 21 +++++++++++++++++ 8.0-oci8-swoole-nginx-prod/Dockerfile | 21 +++++++++++++++++ 8.0-oci8-swoole-nginx/Dockerfile | 21 +++++++++++++++++ 8.1-oci8-nginx-prod/Dockerfile | 21 +++++++++++++++++ 8.1-oci8-nginx/Dockerfile | 21 +++++++++++++++++ 8.1-oci8-swoole-nginx-prod/Dockerfile | 21 +++++++++++++++++ 8.1-oci8-swoole-nginx/Dockerfile | 21 +++++++++++++++++ 8.2-oci8-nginx-prod/Dockerfile | 21 +++++++++++++++++ 8.2-oci8-nginx/Dockerfile | 21 +++++++++++++++++ 8.2-oci8-swoole-nginx-prod/Dockerfile | 21 +++++++++++++++++ 8.2-oci8-swoole-nginx/Dockerfile | 21 +++++++++++++++++ 8.3-oci8-nginx-prod/Dockerfile | 21 +++++++++++++++++ 8.3-oci8-nginx/Dockerfile | 21 +++++++++++++++++ 8.3-oci8-swoole-nginx-prod/Dockerfile | 21 +++++++++++++++++ 8.3-oci8-swoole-nginx/Dockerfile | 21 +++++++++++++++++ README.md | 34 +++++++++++++-------------- fwd-template.json | 32 ++++++++++++------------- 19 files changed, 383 insertions(+), 47 deletions(-) create mode 100644 8.0-oci8-nginx-prod/Dockerfile create mode 100644 8.0-oci8-nginx/Dockerfile create mode 100644 8.0-oci8-swoole-nginx-prod/Dockerfile create mode 100644 8.0-oci8-swoole-nginx/Dockerfile create mode 100644 8.1-oci8-nginx-prod/Dockerfile create mode 100644 8.1-oci8-nginx/Dockerfile create mode 100644 8.1-oci8-swoole-nginx-prod/Dockerfile create mode 100644 8.1-oci8-swoole-nginx/Dockerfile create mode 100644 8.2-oci8-nginx-prod/Dockerfile create mode 100644 8.2-oci8-nginx/Dockerfile create mode 100644 8.2-oci8-swoole-nginx-prod/Dockerfile create mode 100644 8.2-oci8-swoole-nginx/Dockerfile create mode 100644 8.3-oci8-nginx-prod/Dockerfile create mode 100644 8.3-oci8-nginx/Dockerfile create mode 100644 8.3-oci8-swoole-nginx-prod/Dockerfile create mode 100644 8.3-oci8-swoole-nginx/Dockerfile diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index a9776c3..37cc551 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -19,22 +19,22 @@ jobs: - name: Build run: | - docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8 ${{ matrix.version }}-nginx-oci8 - docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8-prod ${{ matrix.version }}-nginx-oci8-prod + docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-nginx ${{ matrix.version }}-oci8-nginx + docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-nginx-prod ${{ matrix.version }}-oci8-nginx-prod - docker build --pull -t kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 ${{ matrix.version }}-swoole-nginx-oci8 - docker build --pull -t kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod ${{ matrix.version }}-swoole-nginx-oci8-prod + docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-swoole-nginx ${{ matrix.version }}-oci8-swoole-nginx + docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod ${{ matrix.version }}-oci8-swoole-nginx-prod - name: Tests run: | - docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);" - docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);" + docker run kooldev/php:${{ matrix.version }}-oci8-nginx php -r "extension_loaded('oci8') or die(1);" + docker run kooldev/php:${{ matrix.version }}-oci8-nginx-prod php -r "extension_loaded('oci8') or die(1);" - docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);" - docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);" + docker run kooldev/php:${{ matrix.version }}-oci8-nginx php -r "extension_loaded('oci8') or die(1);" + docker run kooldev/php:${{ matrix.version }}-oci8-nginx-prod php -r "extension_loaded('oci8') or die(1);" - docker run kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 php -r "extension_loaded('oci8') or die(1);" - docker run kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);" + docker run kooldev/php:${{ matrix.version }}-oci8-swoole-nginx php -r "extension_loaded('oci8') or die(1);" + docker run kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod php -r "extension_loaded('oci8') or die(1);" - name: Login to DockerHub uses: docker/login-action@v2.1.0 @@ -46,8 +46,8 @@ jobs: - name: Push to DockerHub if: github.ref == 'refs/heads/main' && github.repository == 'kool-dev/docker-php-oci8' run: | - docker push kooldev/php:${{ matrix.version }}-nginx-oci8 - docker push kooldev/php:${{ matrix.version }}-nginx-oci8-prod + docker push kooldev/php:${{ matrix.version }}-oci8-nginx + docker push kooldev/php:${{ matrix.version }}-oci8-nginx-prod - docker push kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 - docker push kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod + docker push kooldev/php:${{ matrix.version }}-oci8-swoole-nginx + docker push kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod diff --git a/8.0-oci8-nginx-prod/Dockerfile b/8.0-oci8-nginx-prod/Dockerfile new file mode 100644 index 0000000..0e9a574 --- /dev/null +++ b/8.0-oci8-nginx-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.0-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.0-oci8-nginx/Dockerfile b/8.0-oci8-nginx/Dockerfile new file mode 100644 index 0000000..ee39086 --- /dev/null +++ b/8.0-oci8-nginx/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.0-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.0-oci8-swoole-nginx-prod/Dockerfile b/8.0-oci8-swoole-nginx-prod/Dockerfile new file mode 100644 index 0000000..742a8aa --- /dev/null +++ b/8.0-oci8-swoole-nginx-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.0-swoole-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.0-oci8-swoole-nginx/Dockerfile b/8.0-oci8-swoole-nginx/Dockerfile new file mode 100644 index 0000000..0c0f8e9 --- /dev/null +++ b/8.0-oci8-swoole-nginx/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.0-swoole-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.1-oci8-nginx-prod/Dockerfile b/8.1-oci8-nginx-prod/Dockerfile new file mode 100644 index 0000000..5b3b242 --- /dev/null +++ b/8.1-oci8-nginx-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.1-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.1-oci8-nginx/Dockerfile b/8.1-oci8-nginx/Dockerfile new file mode 100644 index 0000000..e441486 --- /dev/null +++ b/8.1-oci8-nginx/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.1-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.1-oci8-swoole-nginx-prod/Dockerfile b/8.1-oci8-swoole-nginx-prod/Dockerfile new file mode 100644 index 0000000..e19dc40 --- /dev/null +++ b/8.1-oci8-swoole-nginx-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.1-swoole-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.1-oci8-swoole-nginx/Dockerfile b/8.1-oci8-swoole-nginx/Dockerfile new file mode 100644 index 0000000..9d23c6f --- /dev/null +++ b/8.1-oci8-swoole-nginx/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.1-swoole-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.2-oci8-nginx-prod/Dockerfile b/8.2-oci8-nginx-prod/Dockerfile new file mode 100644 index 0000000..62303c4 --- /dev/null +++ b/8.2-oci8-nginx-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.2-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.2-oci8-nginx/Dockerfile b/8.2-oci8-nginx/Dockerfile new file mode 100644 index 0000000..3afbecc --- /dev/null +++ b/8.2-oci8-nginx/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.2-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.2-oci8-swoole-nginx-prod/Dockerfile b/8.2-oci8-swoole-nginx-prod/Dockerfile new file mode 100644 index 0000000..3ec5f63 --- /dev/null +++ b/8.2-oci8-swoole-nginx-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.2-swoole-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.2-oci8-swoole-nginx/Dockerfile b/8.2-oci8-swoole-nginx/Dockerfile new file mode 100644 index 0000000..d8eff40 --- /dev/null +++ b/8.2-oci8-swoole-nginx/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.2-swoole-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.3-oci8-nginx-prod/Dockerfile b/8.3-oci8-nginx-prod/Dockerfile new file mode 100644 index 0000000..8b5bd46 --- /dev/null +++ b/8.3-oci8-nginx-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.3-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.3-oci8-nginx/Dockerfile b/8.3-oci8-nginx/Dockerfile new file mode 100644 index 0000000..96e14d2 --- /dev/null +++ b/8.3-oci8-nginx/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.3-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.3-oci8-swoole-nginx-prod/Dockerfile b/8.3-oci8-swoole-nginx-prod/Dockerfile new file mode 100644 index 0000000..31df101 --- /dev/null +++ b/8.3-oci8-swoole-nginx-prod/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.3-swoole-nginx-prod + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/8.3-oci8-swoole-nginx/Dockerfile b/8.3-oci8-swoole-nginx/Dockerfile new file mode 100644 index 0000000..6675afd --- /dev/null +++ b/8.3-oci8-swoole-nginx/Dockerfile @@ -0,0 +1,21 @@ +FROM kooldev/php:8.3-swoole-nginx + +ENV LD_LIBRARY_PATH /usr/local/instantclient +ENV ORACLE_HOME /usr/local/instantclient + +# Download and unarchive Instant Client v11 +RUN apk add --update libaio libnsl && \ + curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \ + curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \ + unzip -d /usr/local/ /tmp/instaclient-basic.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \ + unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \ + ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \ + ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \ + ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \ + ln -s ${ORACLE_HOME}/lib* /usr/lib && \ + ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \ + ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \ + docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \ + docker-php-ext-install oci8 diff --git a/README.md b/README.md index c66db62..aec89f7 100644 --- a/README.md +++ b/README.md @@ -8,45 +8,45 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl ### 8.3 -- [8.3-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-oci8/Dockerfile) -- [8.3-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-nginx-oci8-prod/Dockerfile) +- [8.3-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-nginx/Dockerfile) +- [8.3-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-nginx-prod/Dockerfile) ### 8.3 with Swoole -- [8.3-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-swoole-nginx-oci8/Dockerfile) -- [8.3-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-swoole-nginx-oci8-prod/Dockerfile) +- [8.3-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-swoole-nginx/Dockerfile) +- [8.3-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-swoole-nginx-prod/Dockerfile) ### 8.2 -- [8.2-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-oci8/Dockerfile) -- [8.2-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-nginx-oci8-prod/Dockerfile) +- [8.2-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-nginx/Dockerfile) +- [8.2-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-nginx-prod/Dockerfile) ### 8.2 with Swoole -- [8.2-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-swoole-nginx-oci8/Dockerfile) -- [8.2-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-swoole-nginx-oci8-prod/Dockerfile) +- [8.2-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-swoole-nginx/Dockerfile) +- [8.2-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-swoole-nginx-prod/Dockerfile) ### 8.1 -- [8.1-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-oci8/Dockerfile) -- [8.1-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-nginx-oci8-prod/Dockerfile) +- [8.1-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-nginx/Dockerfile) +- [8.1-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-nginx-prod/Dockerfile) ### 8.1 with Swoole -- [8.1-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-swoole-nginx-oci8/Dockerfile) -- [8.1-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-swoole-nginx-oci8-prod/Dockerfile) +- [8.1-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-swoole-nginx/Dockerfile) +- [8.1-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-swoole-nginx-prod/Dockerfile) ### 8.0 -- [8.0-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-nginx-oci8/Dockerfile) -- [8.0-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-nginx-oci8-prod/Dockerfile) +- [8.0-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-nginx/Dockerfile) +- [8.0-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-nginx-prod/Dockerfile) ### 8.0 with Swoole -- [8.0-swoole-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-swoole-nginx-oci8/Dockerfile) -- [8.0-swoole-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-swoole-nginx-oci8-prod/Dockerfile) +- [8.0-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-swoole-nginx/Dockerfile) +- [8.0-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-swoole-nginx-prod/Dockerfile) -There are also older versions available like [7.4-nginx-oci8](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-nginx-oci8/Dockerfile), [7.4-nginx-oci8-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-nginx-oci8-prod/Dockerfile). +There are also older versions available like [7.4-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-oci8-nginx/Dockerfile), [7.4-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/7.4-oci8-nginx-prod/Dockerfile). ## Environment Variables diff --git a/fwd-template.json b/fwd-template.json index 98c797f..8e995ee 100644 --- a/fwd-template.json +++ b/fwd-template.json @@ -2,7 +2,7 @@ "output": ".", "builds": [ { - "name": "8.0-nginx-oci8-prod", + "name": "8.0-oci8-nginx-prod", "data": { "from": "kooldev/php:8.0-nginx-prod" }, @@ -14,7 +14,7 @@ ] }, { - "name": "8.0-nginx-oci8", + "name": "8.0-oci8-nginx", "data": { "from": "kooldev/php:8.0-nginx" }, @@ -26,7 +26,7 @@ ] }, { - "name": "8.0-swoole-nginx-oci8-prod", + "name": "8.0-oci8-swoole-nginx-prod", "data": { "from": "kooldev/php:8.0-swoole-nginx-prod" }, @@ -38,7 +38,7 @@ ] }, { - "name": "8.0-swoole-nginx-oci8", + "name": "8.0-oci8-swoole-nginx", "data": { "from": "kooldev/php:8.0-swoole-nginx" }, @@ -50,7 +50,7 @@ ] }, { - "name": "8.1-nginx-oci8-prod", + "name": "8.1-oci8-nginx-prod", "data": { "from": "kooldev/php:8.1-nginx-prod" }, @@ -62,7 +62,7 @@ ] }, { - "name": "8.1-nginx-oci8", + "name": "8.1-oci8-nginx", "data": { "from": "kooldev/php:8.1-nginx" }, @@ -74,7 +74,7 @@ ] }, { - "name": "8.1-swoole-nginx-oci8-prod", + "name": "8.1-oci8-swoole-nginx-prod", "data": { "from": "kooldev/php:8.1-swoole-nginx-prod" }, @@ -86,7 +86,7 @@ ] }, { - "name": "8.1-swoole-nginx-oci8", + "name": "8.1-oci8-swoole-nginx", "data": { "from": "kooldev/php:8.1-swoole-nginx" }, @@ -98,7 +98,7 @@ ] }, { - "name": "8.2-nginx-oci8-prod", + "name": "8.2-oci8-nginx-prod", "data": { "from": "kooldev/php:8.2-nginx-prod" }, @@ -110,7 +110,7 @@ ] }, { - "name": "8.2-nginx-oci8", + "name": "8.2-oci8-nginx", "data": { "from": "kooldev/php:8.2-nginx" }, @@ -122,7 +122,7 @@ ] }, { - "name": "8.2-swoole-nginx-oci8-prod", + "name": "8.2-oci8-swoole-nginx-prod", "data": { "from": "kooldev/php:8.2-swoole-nginx-prod" }, @@ -134,7 +134,7 @@ ] }, { - "name": "8.2-swoole-nginx-oci8", + "name": "8.2-oci8-swoole-nginx", "data": { "from": "kooldev/php:8.2-swoole-nginx" }, @@ -146,7 +146,7 @@ ] }, { - "name": "8.3-nginx-oci8-prod", + "name": "8.3-oci8-nginx-prod", "data": { "from": "kooldev/php:8.3-nginx-prod" }, @@ -158,7 +158,7 @@ ] }, { - "name": "8.3-nginx-oci8", + "name": "8.3-oci8-nginx", "data": { "from": "kooldev/php:8.3-nginx" }, @@ -170,7 +170,7 @@ ] }, { - "name": "8.3-swoole-nginx-oci8-prod", + "name": "8.3-oci8-swoole-nginx-prod", "data": { "from": "kooldev/php:8.3-swoole-nginx-prod" }, @@ -182,7 +182,7 @@ ] }, { - "name": "8.3-swoole-nginx-oci8", + "name": "8.3-oci8-swoole-nginx", "data": { "from": "kooldev/php:8.3-swoole-nginx" }, From 7dfe71501a58466d2008c1450c6173b40fb46a6e Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 9 Jul 2024 15:11:25 -0300 Subject: [PATCH 9/9] Tweak --- kool.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/kool.yml b/kool.yml index 9788033..2a2fa0a 100644 --- a/kool.yml +++ b/kool.yml @@ -3,22 +3,22 @@ scripts: - kool docker fireworkweb/fwd:v1.0 fwd template build: - kool run template - - docker build --pull -t kooldev/php:8.0-nginx-oci8 8.0-nginx-oci8 - - docker build --pull -t kooldev/php:8.0-nginx-oci8-prod 8.0-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.0-swoole-nginx-oci8 8.0-swoole-nginx-oci8 - - docker build --pull -t kooldev/php:8.0-swoole-nginx-oci8-prod 8.0-swoole-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.1-nginx-oci8 8.1-nginx-oci8 - - docker build --pull -t kooldev/php:8.1-nginx-oci8-prod 8.1-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8 8.1-swoole-nginx-oci8 - - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8-prod 8.1-swoole-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.1-swoole-nginx-oci8-prod 8.1-swoole-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.2-nginx-oci8 8.2-nginx-oci8 - - docker build --pull -t kooldev/php:8.2-nginx-oci8-prod 8.2-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8 8.2-swoole-nginx-oci8 - - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8-prod 8.2-swoole-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.2-swoole-nginx-oci8-prod 8.2-swoole-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.3-nginx-oci8 8.3-nginx-oci8 - - docker build --pull -t kooldev/php:8.3-nginx-oci8-prod 8.3-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8 8.3-swoole-nginx-oci8 - - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8-prod 8.3-swoole-nginx-oci8-prod - - docker build --pull -t kooldev/php:8.3-swoole-nginx-oci8-prod 8.3-swoole-nginx-oci8-prod + - docker build --pull -t kooldev/php:8.0-oci8-nginx 8.0-oci8-nginx + - docker build --pull -t kooldev/php:8.0-oci8-nginx-prod 8.0-oci8-nginx-prod + - docker build --pull -t kooldev/php:8.0-oci8-swoole-nginx 8.0-oci8-swoole-nginx + - docker build --pull -t kooldev/php:8.0-oci8-swoole-nginx-prod 8.0-oci8-swoole-nginx-prod + - docker build --pull -t kooldev/php:8.1-oci8-nginx 8.1-oci8-nginx + - docker build --pull -t kooldev/php:8.1-oci8-nginx-prod 8.1-oci8-nginx-prod + - docker build --pull -t kooldev/php:8.1-oci8-swoole-nginx 8.1-oci8-swoole-nginx + - docker build --pull -t kooldev/php:8.1-oci8-swoole-nginx-prod 8.1-oci8-swoole-nginx-prod + - docker build --pull -t kooldev/php:8.1-oci8-swoole-nginx-prod 8.1-oci8-swoole-nginx-prod + - docker build --pull -t kooldev/php:8.2-oci8-nginx 8.2-oci8-nginx + - docker build --pull -t kooldev/php:8.2-oci8-nginx-prod 8.2-oci8-nginx-prod + - docker build --pull -t kooldev/php:8.2-oci8-swoole-nginx 8.2-oci8-swoole-nginx + - docker build --pull -t kooldev/php:8.2-oci8-swoole-nginx-prod 8.2-oci8-swoole-nginx-prod + - docker build --pull -t kooldev/php:8.2-oci8-swoole-nginx-prod 8.2-oci8-swoole-nginx-prod + - docker build --pull -t kooldev/php:8.3-oci8-nginx 8.3-oci8-nginx + - docker build --pull -t kooldev/php:8.3-oci8-nginx-prod 8.3-oci8-nginx-prod + - docker build --pull -t kooldev/php:8.3-oci8-swoole-nginx 8.3-oci8-swoole-nginx + - docker build --pull -t kooldev/php:8.3-oci8-swoole-nginx-prod 8.3-oci8-swoole-nginx-prod + - docker build --pull -t kooldev/php:8.3-oci8-swoole-nginx-prod 8.3-oci8-swoole-nginx-prod