diff --git a/fwd-template.json b/fwd-template.json index e61db65..5a68db5 100644 --- a/fwd-template.json +++ b/fwd-template.json @@ -13,6 +13,10 @@ "name": "Dockerfile", "path": "template/Dockerfile" }, + { + "name": "entrypoint.sh", + "path": "template/entrypoint" + }, { "name": "default.tmpl", "path": "template/default_tmpl" @@ -30,6 +34,10 @@ "name": "Dockerfile", "path": "template/Dockerfile" }, + { + "name": "entrypoint.sh", + "path": "template/entrypoint" + }, { "name": "default.tmpl", "path": "template/default_tmpl" @@ -48,6 +56,10 @@ "name": "Dockerfile", "path": "template/Dockerfile" }, + { + "name": "entrypoint.sh", + "path": "template/entrypoint" + }, { "name": "default.tmpl", "path": "template/default_tmpl" diff --git a/php/Dockerfile b/php/Dockerfile index d1e1eee..f4ef761 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -32,7 +32,11 @@ ENV PHP_FPM=app:9000 \ FASTCGI_BUFFER_SIZE='16k' COPY default.tmpl /etc/nginx/conf.d/default.tmpl +COPY entrypoint.sh /kool/entrypoint.sh + +RUN chmod +x /kool/entrypoint.sh EXPOSE 80 -CMD ["dockerize", "-template", "/etc/nginx/conf.d/default.tmpl:/etc/nginx/conf.d/default.conf", "nginx", "-g", "daemon off;"] +ENTRYPOINT [ "/kool/entrypoint.sh" ] +CMD ["nginx", "-g", "daemon off;"] diff --git a/php/entrypoint.sh b/php/entrypoint.sh new file mode 100644 index 0000000..9ac8a24 --- /dev/null +++ b/php/entrypoint.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dockerize -template /etc/nginx/conf.d/default.tmpl:/etc/nginx/conf.d/default.conf + +exec sh /docker-entrypoint.sh "$@" diff --git a/proxy/Dockerfile b/proxy/Dockerfile index 06d6612..7c79e72 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -26,7 +26,11 @@ ENV LISTEN=80 \ COPY default.tmpl /etc/nginx/conf.d/default.tmpl +COPY entrypoint.sh /kool/entrypoint.sh + +RUN chmod +x /kool/entrypoint.sh EXPOSE 80 -CMD ["dockerize", "-template", "/etc/nginx/conf.d/default.tmpl:/etc/nginx/conf.d/default.conf", "nginx", "-g", "daemon off;"] +ENTRYPOINT [ "/kool/entrypoint.sh" ] +CMD ["nginx", "-g", "daemon off;"] diff --git a/proxy/entrypoint.sh b/proxy/entrypoint.sh new file mode 100644 index 0000000..9ac8a24 --- /dev/null +++ b/proxy/entrypoint.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dockerize -template /etc/nginx/conf.d/default.tmpl:/etc/nginx/conf.d/default.conf + +exec sh /docker-entrypoint.sh "$@" diff --git a/static/Dockerfile b/static/Dockerfile index 819f0ce..a296b1c 100644 --- a/static/Dockerfile +++ b/static/Dockerfile @@ -28,7 +28,11 @@ ENV INDEX=index.html \ COPY default.tmpl /etc/nginx/conf.d/default.tmpl +COPY entrypoint.sh /kool/entrypoint.sh + +RUN chmod +x /kool/entrypoint.sh EXPOSE 80 -CMD ["dockerize", "-template", "/etc/nginx/conf.d/default.tmpl:/etc/nginx/conf.d/default.conf", "nginx", "-g", "daemon off;"] +ENTRYPOINT [ "/kool/entrypoint.sh" ] +CMD ["nginx", "-g", "daemon off;"] diff --git a/static/entrypoint.sh b/static/entrypoint.sh new file mode 100644 index 0000000..9ac8a24 --- /dev/null +++ b/static/entrypoint.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dockerize -template /etc/nginx/conf.d/default.tmpl:/etc/nginx/conf.d/default.conf + +exec sh /docker-entrypoint.sh "$@" diff --git a/template/Dockerfile.blade.php b/template/Dockerfile.blade.php index 09d5926..ee8e059 100644 --- a/template/Dockerfile.blade.php +++ b/template/Dockerfile.blade.php @@ -36,7 +36,11 @@ @endif COPY default.tmpl /etc/nginx/conf.d/default.tmpl +COPY entrypoint.sh /kool/entrypoint.sh + +RUN chmod +x /kool/entrypoint.sh EXPOSE 80 -CMD ["dockerize", "-template", "/etc/nginx/conf.d/default.tmpl:/etc/nginx/conf.d/default.conf", "nginx", "-g", "daemon off;"] +ENTRYPOINT [ "/kool/entrypoint.sh" ] +CMD ["nginx", "-g", "daemon off;"] diff --git a/template/entrypoint.blade.php b/template/entrypoint.blade.php new file mode 100644 index 0000000..9ac8a24 --- /dev/null +++ b/template/entrypoint.blade.php @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +dockerize -template /etc/nginx/conf.d/default.tmpl:/etc/nginx/conf.d/default.conf + +exec sh /docker-entrypoint.sh "$@"