From 952087befc9cec78bec5cc8f40523100eac4677b Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Mon, 25 Dec 2023 18:37:43 +0100
Subject: [PATCH] feat: use nginx image builtin entrypoint

---
 Dockerfile.alpine                               | 4 ++--
 Dockerfile.debian                               | 4 ++--
 app/{docker-entrypoint.sh => 40-nginx-proxy.sh} | 2 --
 app/Procfile                                    | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)
 rename app/{docker-entrypoint.sh => 40-nginx-proxy.sh} (99%)

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 2fb2cda..6f76847 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -21,7 +21,7 @@ RUN apk add --no-cache --virtual .run-deps \
    && update-ca-certificates
 
 # Configure Nginx
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
+RUN sed -i 's/\[ "\$1" = "nginx" \]/\[ "\$1" = "forego" \] || \[ "\$1" = "nginx" \]/' /docker-entrypoint.sh \
    && sed -i 's/worker_processes  1/worker_processes  auto/' /etc/nginx/nginx.conf \
    && sed -i 's/worker_connections  1024/worker_connections  10240/' /etc/nginx/nginx.conf \
    && mkdir -p '/etc/nginx/dhparam'
@@ -31,9 +31,9 @@ COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego
 COPY --from=docker-gen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
 
 COPY network_internal.conf /etc/nginx/
+COPY app/40-nginx-proxy.sh /docker-entrypoint.d/
 
 COPY app nginx.tmpl LICENSE /app/
 WORKDIR /app/
 
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
 CMD ["forego", "start", "-r"]
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 2b7801c..e5f1a83 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -20,7 +20,7 @@ RUN apt-get update \
    && rm -r /var/lib/apt/lists/*
 
 # Configure Nginx
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf \
+RUN sed -i 's/\[ "\$1" = "nginx" \]/\[ "\$1" = "forego" \] || \[ "\$1" = "nginx" \]/' /docker-entrypoint.sh \
    && sed -i 's/worker_processes  1/worker_processes  auto/' /etc/nginx/nginx.conf \
    && sed -i 's/worker_connections  1024/worker_connections  10240/' /etc/nginx/nginx.conf \
    && mkdir -p '/etc/nginx/dhparam'
@@ -30,9 +30,9 @@ COPY --from=forego /usr/local/bin/forego /usr/local/bin/forego
 COPY --from=docker-gen /usr/local/bin/docker-gen /usr/local/bin/docker-gen
 
 COPY network_internal.conf /etc/nginx/
+COPY app/40-nginx-proxy.sh /docker-entrypoint.d/
 
 COPY app nginx.tmpl LICENSE /app/
 WORKDIR /app/
 
-ENTRYPOINT ["/app/docker-entrypoint.sh"]
 CMD ["forego", "start", "-r"]
diff --git a/app/docker-entrypoint.sh b/app/40-nginx-proxy.sh
similarity index 99%
rename from app/docker-entrypoint.sh
rename to app/40-nginx-proxy.sh
index 0477dd2..2848ddc 100755
--- a/app/docker-entrypoint.sh
+++ b/app/40-nginx-proxy.sh
@@ -117,5 +117,3 @@ if [[ $* == 'forego start -r' ]]; then
 		EOT
 	fi
 fi
-
-exec "$@"
diff --git a/app/Procfile b/app/Procfile
index 29fe166..52d6f22 100644
--- a/app/Procfile
+++ b/app/Procfile
@@ -1,2 +1,2 @@
 dockergen: docker-gen -watch -notify "nginx -s reload" /app/nginx.tmpl /etc/nginx/conf.d/default.conf
-nginx: nginx
+nginx: nginx -g "daemon off;"
\ No newline at end of file