From 2d68f5b09a6fd6f5158e94f51fe21c421786c966 Mon Sep 17 00:00:00 2001 From: fabriciojs Date: Sat, 9 Mar 2024 14:43:05 -0300 Subject: [PATCH] drop output handling as it already happens; call original entrypoint --- fwd-template.json | 12 ++++++++++++ php/Dockerfile | 10 +++++----- php/entrypoint.sh | 7 +++++++ proxy/Dockerfile | 10 +++++----- proxy/entrypoint.sh | 7 +++++++ static/Dockerfile | 10 +++++----- static/entrypoint.sh | 7 +++++++ template/Dockerfile.blade.php | 10 +++++----- template/entrypoint.blade.php | 7 +++++++ 9 files changed, 60 insertions(+), 20 deletions(-) create mode 100644 php/entrypoint.sh create mode 100644 proxy/entrypoint.sh create mode 100644 static/entrypoint.sh create mode 100644 template/entrypoint.blade.php 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 b956b81..f4ef761 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -17,10 +17,6 @@ RUN mkdir /etc/nginx/h5bp \ && mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \ && rm -rf server-configs-nginx-* -# handle output -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log \ - WORKDIR /app ENV LISTEN=80 \ @@ -36,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 53e808c..7c79e72 100644 --- a/proxy/Dockerfile +++ b/proxy/Dockerfile @@ -17,10 +17,6 @@ RUN mkdir /etc/nginx/h5bp \ && mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \ && rm -rf server-configs-nginx-* -# handle output -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log \ - WORKDIR /app ENV LISTEN=80 \ @@ -30,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 a17f001..a296b1c 100644 --- a/static/Dockerfile +++ b/static/Dockerfile @@ -17,10 +17,6 @@ RUN mkdir /etc/nginx/h5bp \ && mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \ && rm -rf server-configs-nginx-* -# handle output -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log \ - WORKDIR /app ENV LISTEN=80 \ @@ -32,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 1c7fafe..ee8e059 100644 --- a/template/Dockerfile.blade.php +++ b/template/Dockerfile.blade.php @@ -17,10 +17,6 @@ && mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \ && rm -rf server-configs-nginx-* -# handle output -RUN ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log \ - WORKDIR /app ENV LISTEN=80 \ @@ -40,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 "$@"