Skip to content

Commit 79ff90b

Browse files
dbpolitodbpolito
authored
Merge pull request #34 from lucassmacedo/main
feat: add PHP 8.4 support with OCI8 extension
2 parents ac68b7b + f1e9f04 commit 79ff90b

13 files changed

Lines changed: 63 additions & 206 deletions

File tree

‎.github/workflows/ci-cd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
version: ['8.0', '8.1', '8.2', '8.3']
14+
version: ['8.2', '8.3', '8.4']
1515

1616
steps:
1717
- name: Checkout code

‎8.1-oci8-nginx-prod/Dockerfile‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎8.1-oci8-nginx/Dockerfile‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎8.1-oci8-swoole-nginx-prod/Dockerfile‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎8.1-oci8-swoole-nginx/Dockerfile‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

8.0-oci8-nginx/Dockerfile renamed to 8.4-oci8-nginx-prod/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM kooldev/php:8.0-nginx
1+
FROM kooldev/php:8.4-nginx-prod
22

33
ENV LD_LIBRARY_PATH /usr/local/instantclient
44
ENV ORACLE_HOME /usr/local/instantclient
55

66
# Download and unarchive Instant Client v11
7-
RUN apk add --update libaio libnsl && \
7+
RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
88
curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
99
curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
1010
curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +17,6 @@ RUN apk add --update libaio libnsl && \
1717
ln -s ${ORACLE_HOME}/lib* /usr/lib && \
1818
ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
1919
ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \
20-
docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
21-
docker-php-ext-install oci8
20+
echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
21+
docker-php-ext-enable oci8 && \
22+
apk del $PHPIZE_DEPS

8.0-oci8-nginx-prod/Dockerfile renamed to 8.4-oci8-nginx/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM kooldev/php:8.0-nginx-prod
1+
FROM kooldev/php:8.4-nginx
22

33
ENV LD_LIBRARY_PATH /usr/local/instantclient
44
ENV ORACLE_HOME /usr/local/instantclient
55

66
# Download and unarchive Instant Client v11
7-
RUN apk add --update libaio libnsl && \
7+
RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
88
curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
99
curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
1010
curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +17,6 @@ RUN apk add --update libaio libnsl && \
1717
ln -s ${ORACLE_HOME}/lib* /usr/lib && \
1818
ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
1919
ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \
20-
docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
21-
docker-php-ext-install oci8
20+
echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
21+
docker-php-ext-enable oci8 && \
22+
apk del $PHPIZE_DEPS

8.0-oci8-swoole-nginx/Dockerfile renamed to 8.4-oci8-swoole-nginx-prod/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM kooldev/php:8.0-swoole-nginx
1+
FROM kooldev/php:8.4-swoole-nginx-prod
22

33
ENV LD_LIBRARY_PATH /usr/local/instantclient
44
ENV ORACLE_HOME /usr/local/instantclient
55

66
# Download and unarchive Instant Client v11
7-
RUN apk add --update libaio libnsl && \
7+
RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
88
curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
99
curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
1010
curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +17,6 @@ RUN apk add --update libaio libnsl && \
1717
ln -s ${ORACLE_HOME}/lib* /usr/lib && \
1818
ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
1919
ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \
20-
docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
21-
docker-php-ext-install oci8
20+
echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
21+
docker-php-ext-enable oci8 && \
22+
apk del $PHPIZE_DEPS

8.0-oci8-swoole-nginx-prod/Dockerfile renamed to 8.4-oci8-swoole-nginx/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM kooldev/php:8.0-swoole-nginx-prod
1+
FROM kooldev/php:8.4-swoole-nginx
22

33
ENV LD_LIBRARY_PATH /usr/local/instantclient
44
ENV ORACLE_HOME /usr/local/instantclient
55

66
# Download and unarchive Instant Client v11
7-
RUN apk add --update libaio libnsl && \
7+
RUN apk add --update libaio libnsl $PHPIZE_DEPS && \
88
curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
99
curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
1010
curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
@@ -17,5 +17,6 @@ RUN apk add --update libaio libnsl && \
1717
ln -s ${ORACLE_HOME}/lib* /usr/lib && \
1818
ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
1919
ln -s /usr/lib/libnsl.so.3 /usr/lib/libnsl.so.1 && \
20-
docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
21-
docker-php-ext-install oci8
20+
echo "instantclient,${ORACLE_HOME}" | pecl install oci8 && \
21+
docker-php-ext-enable oci8 && \
22+
apk del $PHPIZE_DEPS

‎README.md‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
66

77
## Available Tags
88

9+
### 8.4
10+
11+
- [8.4-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.4-oci8-nginx/Dockerfile)
12+
- [8.4-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.4-oci8-nginx-prod/Dockerfile)
13+
14+
### 8.4 with Swoole
15+
16+
- [8.4-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.4-oci8-swoole-nginx/Dockerfile)
17+
- [8.4-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.4-oci8-swoole-nginx-prod/Dockerfile)
18+
919
### 8.3
1020

1121
- [8.3-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.3-oci8-nginx/Dockerfile)
@@ -26,26 +36,6 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl
2636
- [8.2-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-swoole-nginx/Dockerfile)
2737
- [8.2-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.2-oci8-swoole-nginx-prod/Dockerfile)
2838

29-
### 8.1
30-
31-
- [8.1-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-nginx/Dockerfile)
32-
- [8.1-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-nginx-prod/Dockerfile)
33-
34-
### 8.1 with Swoole
35-
36-
- [8.1-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-swoole-nginx/Dockerfile)
37-
- [8.1-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.1-oci8-swoole-nginx-prod/Dockerfile)
38-
39-
### 8.0
40-
41-
- [8.0-oci8-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-nginx/Dockerfile)
42-
- [8.0-oci8-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-nginx-prod/Dockerfile)
43-
44-
### 8.0 with Swoole
45-
46-
- [8.0-oci8-swoole-nginx](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-swoole-nginx/Dockerfile)
47-
- [8.0-oci8-swoole-nginx-prod](https://github.com/kool-dev/docker-php-oci8/blob/main/8.0-oci8-swoole-nginx-prod/Dockerfile)
48-
4939
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).
5040

5141
## Environment Variables

0 commit comments

Comments
 (0)