From e6c20afcf3faf8c3fd8c0c2e476555ebc21d8025 Mon Sep 17 00:00:00 2001
From: Giacomo Mazzamuto <g.mazzamuto@gmail.com>
Date: Wed, 21 Oct 2020 23:26:05 +0200
Subject: [PATCH] Use entrypoint mechanism from latest nginx images (#150)

This allows the user to execute custom scripts before the server starts.
---
 arm32v7-static.dockerfile | 4 +---
 arm64v8-static.dockerfile | 4 +---
 bin/entrypoint            | 6 ------
 debian-static.dockerfile  | 4 +---
 static.dockerfile         | 4 +---
 5 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/arm32v7-static.dockerfile b/arm32v7-static.dockerfile
index 57a1e1e..b659909 100644
--- a/arm32v7-static.dockerfile
+++ b/arm32v7-static.dockerfile
@@ -23,6 +23,4 @@ ENV NGINX_PROXY_HEADER_Host '$http_host'
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY dist/ /usr/share/nginx/html/
 COPY dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js
-COPY bin/entrypoint /bin
-
-ENTRYPOINT entrypoint
+COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
diff --git a/arm64v8-static.dockerfile b/arm64v8-static.dockerfile
index 405303d..e0d6aa5 100644
--- a/arm64v8-static.dockerfile
+++ b/arm64v8-static.dockerfile
@@ -23,6 +23,4 @@ ENV NGINX_PROXY_HEADER_Host '$http_host'
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY dist/ /usr/share/nginx/html/
 COPY dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js
-COPY bin/entrypoint /bin
-
-ENTRYPOINT entrypoint
+COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
diff --git a/bin/entrypoint b/bin/entrypoint
index dc4fd94..80377ec 100755
--- a/bin/entrypoint
+++ b/bin/entrypoint
@@ -38,9 +38,3 @@ if [ -n "${REGISTRY_URL}" ] ; then
   sed -i "s^\${NGINX_PROXY_HEADERS}^$(get_nginx_proxy_headers)^" /etc/nginx/conf.d/default.conf
   sed -i "s,#!,," /etc/nginx/conf.d/default.conf
 fi
-
-if [ -z "$@" ]; then
-  exec nginx -g "daemon off;"
-else
-  exec $@
-fi
diff --git a/debian-static.dockerfile b/debian-static.dockerfile
index b5d0d64..87cc894 100644
--- a/debian-static.dockerfile
+++ b/debian-static.dockerfile
@@ -23,6 +23,4 @@ ENV NGINX_PROXY_HEADER_Host '$http_host'
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY dist/ /usr/share/nginx/html/
 COPY dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js
-COPY bin/entrypoint /bin
-
-ENTRYPOINT entrypoint
+COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
diff --git a/static.dockerfile b/static.dockerfile
index 9b371d9..9459e0d 100644
--- a/static.dockerfile
+++ b/static.dockerfile
@@ -35,6 +35,4 @@ ENV NGINX_PROXY_HEADER_Host '$http_host'
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /usr/app/dist/ /usr/share/nginx/html/
 COPY --from=builder /usr/app/dist/scripts/docker-registry-ui-static.js /usr/share/nginx/html/scripts/docker-registry-ui.js
-COPY bin/entrypoint /bin
-
-ENTRYPOINT entrypoint
+COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh