Use entrypoint mechanism from latest nginx images (#150)

This allows the user to execute custom scripts before the server starts.
This commit is contained in:
Giacomo Mazzamuto 2020-10-21 23:26:05 +02:00 committed by GitHub
parent 1220825f31
commit e6c20afcf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 18 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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