drop output handling as it already happens; call original entrypoint

kool-dev · Mar 9, 2024 · 2d68f5b · 2d68f5b
1 parent 076f688
commit 2d68f5b
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 "$@"