Skip to content

Commit f9544bf

Browse files
authored
Merge pull request #2 from kool-dev/fix-libnsl
Fix libnsl
2 parents 6981651 + fba729e commit f9544bf

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

7.4-nginx-oci8-prod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ RUN apk add --update libaio libnsl && \
1616
ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \
1717
ln -s ${ORACLE_HOME}/lib* /usr/lib && \
1818
ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
19-
ln -s /usr/lib/libnsl.so.2.0.0 /usr/lib/libnsl.so.1 && \
19+
ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1 && \
2020
docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
2121
docker-php-ext-install oci8

7.4-nginx-oci8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ RUN apk add --update libaio libnsl && \
1616
ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \
1717
ln -s ${ORACLE_HOME}/lib* /usr/lib && \
1818
ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
19-
ln -s /usr/lib/libnsl.so.2.0.0 /usr/lib/libnsl.so.1 && \
19+
ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1 && \
2020
docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
2121
docker-php-ext-install oci8

README.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ Please refer to [kooldev/php](https://github.com/kool-dev/docker-php).
2727

2828
### Update images with templates
2929

30-
- [fwd](https://github.com/fireworkweb/fwd#fireworkwebfwd)
30+
The Dockerfile's are automatically managed by `fwd-template.json` configuration file and files in the `template` folder. We should always make changes directly to these files.
3131

32-
You should change `fwd-template.json` and `template` folder.
33-
34-
After your changes, just run `kool docker fireworkweb/fwd:v1.0 fwd template` to compile the template and generate all version folder/files.
32+
After any changes, we need to run `kool run template` to parse the templates and generate folder/files for each version.
3533

3634
## License
3735

build.sh

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

kool.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
scripts:
2+
template:
3+
- kool docker fireworkweb/fwd:v1.0 fwd template
4+
build:
5+
- kool run template
6+
- docker build --pull -t kooldev/php:7.4-nginx-oci8 7.4-nginx-oci8
7+
- docker build --pull -t kooldev/php:7.4-nginx-oci8-prod 7.4-nginx-oci8-prod

template/Dockerfile.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
ln -s ${ORACLE_HOME}/libocci.so.* ${ORACLE_HOME}/libocci.so && \
1717
ln -s ${ORACLE_HOME}/lib* /usr/lib && \
1818
ln -s ${ORACLE_HOME}/sqlplus /usr/bin/sqlplus && \
19-
ln -s /usr/lib/libnsl.so.2.0.0 /usr/lib/libnsl.so.1 && \
19+
ln -s /usr/lib/libnsl.so.2 /usr/lib/libnsl.so.1 && \
2020
docker-php-ext-configure oci8 --with-oci8=instantclient,$ORACLE_HOME && \
2121
docker-php-ext-install oci8

0 commit comments

Comments
 (0)