Skip to content

Commit 7924bbb

Browse files
dbpolitodbpolito
authored
Merge pull request #15 from kool-dev/improve_entrypoint
Improve Entrypoint + Fix Nginx PROD
2 parents f2ad11e + d04ad10 commit 7924bbb

36 files changed

Lines changed: 364 additions & 44 deletions

‎7.1-nginx-prod/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
2121

2222
COPY supervisor.conf /kool/supervisor.conf
2323
COPY default.tmpl /kool/default.tmpl
24+
COPY entrypoint /kool/entrypoint
25+
RUN chmod +x /kool/entrypoint
2426

2527
EXPOSE 80
2628

27-
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "-template", "/kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf", "-template", "/kool/default.tmpl:/etc/nginx/conf.d/default.conf", "/kool/entrypoint" ]
2829
CMD [ "supervisord", "-c", "/kool/supervisor.conf" ]

‎7.1-nginx-prod/entrypoint‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/sh
2+
set -e
3+
4+
5+
# Run as current user
6+
CURRENT_USER=${ASUSER:-${UID:-0}}
7+
8+
if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
9+
usermod -u $CURRENT_USER kool
10+
fi
11+
12+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
13+
14+
# Run entrypoint if provided
15+
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
16+
bash $ENTRYPOINT
17+
fi
18+
19+
if [ "$1" = "sh" ] || [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] || [ "$1" = "nginx" ] || [ "$1" = "supervisord" ]; then
20+
exec "$@"
21+
else
22+
exec su-exec kool "$@"
23+
fi

‎7.1-nginx/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
2121

2222
COPY supervisor.conf /kool/supervisor.conf
2323
COPY default.tmpl /kool/default.tmpl
24+
COPY entrypoint /kool/entrypoint
25+
RUN chmod +x /kool/entrypoint
2426

2527
EXPOSE 80
2628

27-
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "-template", "/kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf", "-template", "/kool/default.tmpl:/etc/nginx/conf.d/default.conf", "/kool/entrypoint" ]
2829
CMD [ "supervisord", "-c", "/kool/supervisor.conf" ]

‎7.1-nginx/entrypoint‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/sh
2+
set -e
3+
4+
if [ "$ENABLE_XDEBUG" == "true" ]; then
5+
docker-php-ext-enable xdebug >> /dev/null 2>&1
6+
7+
if [ $? != "0" ]; then
8+
echo "[ERROR] An error happened enabling xdebug"
9+
10+
exit 1
11+
fi
12+
fi
13+
14+
# Run as current user
15+
CURRENT_USER=${ASUSER:-${UID:-0}}
16+
17+
if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
18+
usermod -u $CURRENT_USER kool
19+
fi
20+
21+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
22+
23+
# Run entrypoint if provided
24+
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
25+
bash $ENTRYPOINT
26+
fi
27+
28+
if [ "$1" = "sh" ] || [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] || [ "$1" = "nginx" ] || [ "$1" = "supervisord" ]; then
29+
exec "$@"
30+
else
31+
exec su-exec kool "$@"
32+
fi

‎7.1-prod/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ RUN adduser -D -u 1337 kool \
5656
zip \
5757
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
5858
# composer
59-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
59+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
60+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
6061
&& su-exec kool composer global require hirak/prestissimo \
6162
# cleanup
6263
&& apk del .build-deps \
@@ -69,5 +70,5 @@ RUN chmod +x /kool/entrypoint
6970

7071
EXPOSE 9000
7172

72-
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "-template", "/kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf", "/kool/entrypoint" ]
73+
ENTRYPOINT [ "/kool/entrypoint" ]
7374
CMD [ "php-fpm" ]

‎7.1-prod/entrypoint‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
99
usermod -u $CURRENT_USER kool
1010
fi
1111

12+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf
13+
1214
# Run entrypoint if provided
1315
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
1416
bash $ENTRYPOINT
1517
fi
1618

17-
if [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] || [ "$1" = "nginx" ] || [ "$1" = "supervisord" ]; then
19+
if [ "$1" = "sh" ] || [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] ]; then
1820
exec "$@"
1921
else
2022
exec su-exec kool "$@"

‎7.1/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ RUN adduser -D -u 1337 kool \
5656
zip \
5757
&& cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
5858
# composer
59-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
59+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
60+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
6061
&& su-exec kool composer global require hirak/prestissimo \
6162
# cleanup
6263
&& apk del .build-deps \
@@ -69,5 +70,5 @@ RUN chmod +x /kool/entrypoint
6970

7071
EXPOSE 9000
7172

72-
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "-template", "/kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf", "/kool/entrypoint" ]
73+
ENTRYPOINT [ "/kool/entrypoint" ]
7374
CMD [ "php-fpm" ]

‎7.1/entrypoint‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
1818
usermod -u $CURRENT_USER kool
1919
fi
2020

21+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf
22+
2123
# Run entrypoint if provided
2224
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
2325
bash $ENTRYPOINT
2426
fi
2527

26-
if [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] || [ "$1" = "nginx" ] || [ "$1" = "supervisord" ]; then
28+
if [ "$1" = "sh" ] || [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] ]; then
2729
exec "$@"
2830
else
2931
exec su-exec kool "$@"

‎7.2-nginx-prod/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s
2121

2222
COPY supervisor.conf /kool/supervisor.conf
2323
COPY default.tmpl /kool/default.tmpl
24+
COPY entrypoint /kool/entrypoint
25+
RUN chmod +x /kool/entrypoint
2426

2527
EXPOSE 80
2628

27-
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "-template", "/kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf", "-template", "/kool/default.tmpl:/etc/nginx/conf.d/default.conf", "/kool/entrypoint" ]
2829
CMD [ "supervisord", "-c", "/kool/supervisor.conf" ]

‎7.2-nginx-prod/entrypoint‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/sh
2+
set -e
3+
4+
5+
# Run as current user
6+
CURRENT_USER=${ASUSER:-${UID:-0}}
7+
8+
if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then
9+
usermod -u $CURRENT_USER kool
10+
fi
11+
12+
dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf
13+
14+
# Run entrypoint if provided
15+
if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then
16+
bash $ENTRYPOINT
17+
fi
18+
19+
if [ "$1" = "sh" ] || [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] || [ "$1" = "nginx" ] || [ "$1" = "supervisord" ]; then
20+
exec "$@"
21+
else
22+
exec su-exec kool "$@"
23+
fi

0 commit comments

Comments
 (0)