Skip to content

Commit 2af8541

Browse files
dbpolitodbpolito
authored
Merge pull request #25 from lucassmacedo/main
Add PHP 8.2 and 8.3 Suport
2 parents 7dda13b + 7dfe715 commit 2af8541

File tree

21 files changed

+307
-89
lines changed

21 files changed

+307
-89
lines changed

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

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,30 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
version: ['7.4', '8.0', '8.1']
14+
version: ['8.0', '8.1', '8.2', '8.3']
1515

1616
steps:
1717
- name: Checkout code
1818
uses: actions/[email protected]
1919

2020
- name: Build
2121
run: |
22-
docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8 ${{ matrix.version }}-nginx-oci8
23-
docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-oci8-prod ${{ matrix.version }}-nginx-oci8-prod
22+
docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-nginx ${{ matrix.version }}-oci8-nginx
23+
docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-nginx-prod ${{ matrix.version }}-oci8-nginx-prod
2424
25-
- name: Build Swoole
26-
if: matrix.version != '7.4'
27-
run: |
28-
docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 ${{ matrix.version }}-nginx-swoole-oci8
29-
docker build --pull -t kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod ${{ matrix.version }}-nginx-swoole-oci8-prod
25+
docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-swoole-nginx ${{ matrix.version }}-oci8-swoole-nginx
26+
docker build --pull -t kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod ${{ matrix.version }}-oci8-swoole-nginx-prod
3027
3128
- name: Tests
3229
run: |
33-
docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);"
34-
docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);"
30+
docker run kooldev/php:${{ matrix.version }}-oci8-nginx php -r "extension_loaded('oci8') or die(1);"
31+
docker run kooldev/php:${{ matrix.version }}-oci8-nginx-prod php -r "extension_loaded('oci8') or die(1);"
3532
36-
- name: Tests Swoole
37-
if: matrix.version != '7.4'
38-
run: |
39-
docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);"
40-
docker run kooldev/php:${{ matrix.version }}-nginx-oci8-prod php -r "extension_loaded('oci8') or die(1);"
33+
docker run kooldev/php:${{ matrix.version }}-oci8-nginx php -r "extension_loaded('oci8') or die(1);"
34+
docker run kooldev/php:${{ matrix.version }}-oci8-nginx-prod php -r "extension_loaded('oci8') or die(1);"
4135
42-
docker run kooldev/php:${{ matrix.version }}-nginx-swoole-oci8 php -r "extension_loaded('oci8') or die(1);"
43-
docker run kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod php -r "extension_loaded('oci8') or die(1);"
36+
docker run kooldev/php:${{ matrix.version }}-oci8-swoole-nginx php -r "extension_loaded('oci8') or die(1);"
37+
docker run kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod php -r "extension_loaded('oci8') or die(1);"
4438
4539
- name: Login to DockerHub
4640
uses: docker/[email protected]
@@ -52,11 +46,8 @@ jobs:
5246
- name: Push to DockerHub
5347
if: github.ref == 'refs/heads/main' && github.repository == 'kool-dev/docker-php-oci8'
5448
run: |
55-
docker push kooldev/php:${{ matrix.version }}-nginx-oci8
56-
docker push kooldev/php:${{ matrix.version }}-nginx-oci8-prod
49+
docker push kooldev/php:${{ matrix.version }}-oci8-nginx
50+
docker push kooldev/php:${{ matrix.version }}-oci8-nginx-prod
5751
58-
- name: Push to DockerHub Swoole
59-
if: github.ref == 'refs/heads/main' && github.repository == 'kool-dev/docker-php-oci8' && matrix.version != '7.4'
60-
run: |
61-
docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8
62-
docker push kooldev/php:${{ matrix.version }}-nginx-swoole-oci8-prod
52+
docker push kooldev/php:${{ matrix.version }}-oci8-swoole-nginx
53+
docker push kooldev/php:${{ matrix.version }}-oci8-swoole-nginx-prod

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

File renamed without changes.

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

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM kooldev/php:8.0-nginx-swoole-prod
1+
FROM kooldev/php:8.0-swoole-nginx-prod
22

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

8.1-nginx-swoole-oci8/Dockerfile renamed to 8.0-oci8-swoole-nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM kooldev/php:8.1-nginx-swoole
1+
FROM kooldev/php:8.0-swoole-nginx
22

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

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

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

8.1-nginx-oci8-prod/Dockerfile renamed to 8.1-oci8-nginx-prod/Dockerfile

File renamed without changes.

8.1-nginx-oci8/Dockerfile renamed to 8.1-oci8-nginx/Dockerfile

File renamed without changes.

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM kooldev/php:8.1-swoole-nginx-prod
2+
3+
ENV LD_LIBRARY_PATH /usr/local/instantclient
4+
ENV ORACLE_HOME /usr/local/instantclient
5+
6+
# Download and unarchive Instant Client v11
7+
RUN apk add --update libaio libnsl && \
8+
curl -o /tmp/instaclient-basic.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-basic-linux.x64-11.2.0.4.0.zip && \
9+
curl -o /tmp/instaclient-sdk.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sdk-linux.x64-11.2.0.4.0.zip && \
10+
curl -o /tmp/instaclient-sqlplus.zip https://raw.githubusercontent.com/bumpx/oracle-instantclient/master/instantclient-sqlplus-linux.x64-11.2.0.4.0.zip && \
11+
unzip -d /usr/local/ /tmp/instaclient-basic.zip && \
12+
unzip -d /usr/local/ /tmp/instaclient-sdk.zip && \
13+
unzip -d /usr/local/ /tmp/instaclient-sqlplus.zip && \
14+
ln -s /usr/local/instantclient_11_2 ${ORACLE_HOME} && \
15+
ln -s ${ORACLE_HOME}/libclntsh.so.* ${ORACLE_HOME}/libclntsh.so && \
16+
ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \
17+
ln -s ${ORACLE_HOME}/lib* /usr/lib && \
18+
ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
19+
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

8.0-nginx-swoole-oci8/Dockerfile renamed to 8.1-oci8-swoole-nginx/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM kooldev/php:8.0-nginx-swoole
1+
FROM kooldev/php:8.1-swoole-nginx
22

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

0 commit comments

Comments
 (0)