Compare commits

..

No commits in common. "0ee6ef3fc41d3e1d50208e49737f493435c63cd6" and "2e26095dbf0c680e0cfb458306b0a1c3e3625a67" have entirely different histories.

2 changed files with 3 additions and 9 deletions

View File

@ -2,7 +2,7 @@
# build AB-NGINX container (based on NGINX mainline) # build AB-NGINX container (based on NGINX mainline)
# #
ARG NGINX_VERSION=1.21.3 ARG NGINX_VERSION=1.21.1
FROM nginx:${NGINX_VERSION}-alpine FROM nginx:${NGINX_VERSION}-alpine
ARG NGINX_VERSION ARG NGINX_VERSION
@ -21,10 +21,7 @@ RUN addgroup --gid ${GID} www-docker \
--uid ${UID} \ --uid ${UID} \
www-docker www-docker
# add libcap and allow nginx to bind to ports <1024; # add libcap, allow nginx to bind to ports <1024, extract fun error pages & create LetsEncrypt challenge directory outside webroot
# extract fun error pages;
# create /certs directory for auto-generation;
# create LetsEncrypt challenge directory outside webroot
RUN apk --update --no-cache add \ RUN apk --update --no-cache add \
libcap \ libcap \
openssl \ openssl \
@ -38,7 +35,6 @@ RUN apk --update --no-cache add \
&& rm -rf /tmp/* \ && rm -rf /tmp/* \
&& rm -rf /docker-entrypoint.d \ && rm -rf /docker-entrypoint.d \
&& rm -f /docker-entrypoint.sh \ && rm -f /docker-entrypoint.sh \
&& mkdir /certs \
&& mkdir /usr/share/nginx/letsencrypt && mkdir /usr/share/nginx/letsencrypt
# health check # health check
@ -81,8 +77,6 @@ RUN chown -R www-docker:www-docker /usr/share/nginx \
&& find /etc/nginx -type f -exec chmod 640 {} \; \ && find /etc/nginx -type f -exec chmod 640 {} \; \
&& chown www-docker:www-docker /var/cache/nginx \ && chown www-docker:www-docker /var/cache/nginx \
&& chown www-docker:www-docker /var/log/nginx \ && chown www-docker:www-docker /var/log/nginx \
&& chown www-docker:www-docker /certs \
&& chmod 700 /certs \
&& chmod 644 /etc/selfsigned.cnf \ && chmod 644 /etc/selfsigned.cnf \
&& chmod 755 /usr/local/bin/generate-cert /usr/local/bin/entrypoint.sh && chmod 755 /usr/local/bin/generate-cert /usr/local/bin/entrypoint.sh
USER www-docker USER www-docker

View File

@ -94,7 +94,7 @@ scriptHelp() {
# footer # footer
newline newline
printf "%s" "$yellow" printf "%s" "$yellow"
textBlock "More information can be found at: https://git.asifbacchus.dev/ab-docker/ab-nginx/wiki" textBlock"More information can be found at: https://git.asifbacchus.dev/ab-docker/ab-nginx/wiki"
printf "\n%s" "$magenta" printf "\n%s" "$magenta"
printf '%.0s-' $(seq "$width") printf '%.0s-' $(seq "$width")
printf "\n%s" "$norm" printf "\n%s" "$norm"