Skip to content

Commit b9acad9

Browse files
committed
wip
1 parent 8c281dc commit b9acad9

File tree

19 files changed

+383
-47
lines changed

19 files changed

+383
-47
lines changed

.github/workflows/ci-cd.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ jobs:
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-
docker build --pull -t kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 ${{ matrix.version }}-swoole-nginx-oci8
26-
docker build --pull -t kooldev/php:${{ matrix.version }}-swoole-nginx-oci8-prod ${{ matrix.version }}-swoole-nginx-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
2727
2828
- name: Tests
2929
run: |
30-
docker run kooldev/php:${{ matrix.version }}-nginx-oci8 php -r "extension_loaded('oci8') or die(1);"
31-
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);"
3232
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);"
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);"
3535
36-
docker run kooldev/php:${{ matrix.version }}-swoole-nginx-oci8 php -r "extension_loaded('oci8') or die(1);"
37-
docker run kooldev/php:${{ matrix.version }}-swoole-nginx-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);"
3838
3939
- name: Login to DockerHub
4040
uses: docker/[email protected]
@@ -46,8 +46,8 @@ jobs:
4646
- name: Push to DockerHub
4747
if: github.ref == 'refs/heads/main' && github.repository == 'kool-dev/docker-php-oci8'
4848
run: |
49-
docker push kooldev/php:${{ matrix.version }}-nginx-oci8
50-
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
5151
52-
docker push kooldev/php:${{ matrix.version }}-swoole-nginx-oci8
53-
docker push kooldev/php:${{ matrix.version }}-swoole-nginx-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-oci8-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.0-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-oci8-nginx/Dockerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM kooldev/php:8.0-nginx
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
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM kooldev/php:8.0-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-oci8-swoole-nginx/Dockerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM kooldev/php:8.0-swoole-nginx
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.1-oci8-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-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.1-oci8-nginx/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-nginx
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
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.1-oci8-swoole-nginx/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
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.2-oci8-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.2-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

0 commit comments

Comments
 (0)