Merge pull request #10 from kool-dev/normalization

Normalization - cloud native
kool-dev · Mar 18, 2024 · 9e27ef8 · 9e27ef8
2 parents a5a9a28 + 2d68f5b
commit 9e27ef8
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 4 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 "$@"