fix(entrypoint): nginx crashes when overriding default.conf

fixes #247 closes #251
Joxit · May 6, 2022 · c84c9f3 · c84c9f3
1 parent 1939b47
commit c84c9f3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -23,7 +23,7 @@ ENV NGINX_LISTEN_PORT '80'
 ENV SHOW_CATALOG_NB_TAGS 'false'
 
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
+COPY bin/90-docker-registry-ui.sh /docker-entrypoint.d/90-docker-registry-ui.sh
 COPY dist/ /usr/share/nginx/html/
 COPY favicon.ico /usr/share/nginx/html/
 

diff --git a/arm32v7.dockerfile b/arm32v7.dockerfile
@@ -23,7 +23,7 @@ ENV NGINX_LISTEN_PORT '80'
 ENV SHOW_CATALOG_NB_TAGS 'false'
 
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
+COPY bin/90-docker-registry-ui.sh /docker-entrypoint.d/90-docker-registry-ui.sh
 COPY dist/ /usr/share/nginx/html/
 COPY favicon.ico /usr/share/nginx/html/
 

diff --git a/arm64v8.dockerfile b/arm64v8.dockerfile
@@ -23,7 +23,7 @@ ENV NGINX_LISTEN_PORT '80'
 ENV SHOW_CATALOG_NB_TAGS 'false'
 
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
+COPY bin/90-docker-registry-ui.sh /docker-entrypoint.d/90-docker-registry-ui.sh
 COPY dist/ /usr/share/nginx/html/
 COPY favicon.ico /usr/share/nginx/html/
 

diff --git a/bin/entrypoint → bin/90-docker-registry-ui.sh b/bin/entrypoint → bin/90-docker-registry-ui.sh
@@ -58,11 +58,13 @@ if [ -n "${NGINX_PROXY_PASS_URL}" ] ; then
 fi
 
 if [ "$(whoami)" != "root" ]; then
-  if [ "$NGINX_LISTEN_PORT" = 80 ]; then
+  if [ "$NGINX_LISTEN_PORT" = "80" ]; then
     NGINX_LISTEN_PORT="8080"
   fi
   sed -i "/user  nginx;/d" /etc/nginx/nginx.conf
   sed -i "s,/var/run/nginx.pid,/tmp/nginx.pid," /etc/nginx/nginx.conf
 fi
 
-sed -i "s,listen       80;,listen       $NGINX_LISTEN_PORT;," /etc/nginx/conf.d/default.conf
+if [ "$NGINX_LISTEN_PORT" != "80" ]; then
+  sed -i "s,listen       80;,listen       $NGINX_LISTEN_PORT;," /etc/nginx/conf.d/default.conf
+fi
diff --git a/debian.dockerfile b/debian.dockerfile
@@ -23,7 +23,7 @@ ENV NGINX_LISTEN_PORT '80'
 ENV SHOW_CATALOG_NB_TAGS 'false'
 
 COPY nginx/default.conf /etc/nginx/conf.d/default.conf
-COPY bin/entrypoint /docker-entrypoint.d/90-docker-registry-ui.sh
+COPY bin/90-docker-registry-ui.sh /docker-entrypoint.d/90-docker-registry-ui.sh
 COPY dist/ /usr/share/nginx/html/
 COPY favicon.ico /usr/share/nginx/html/
 

diff --git a/dist/docker-registry-ui.js b/dist/docker-registry-ui.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docker-registry-ui",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "scripts": {
     "format": "npm run format-html && npm run format-js && npm run format-riot",
     "format-html": "find src rollup rollup.config.js -name '*.html' -exec prettier --config .prettierrc -w --parser html {} \\;",