ab-docker/ab-nginx
1
0
Fork 0
Code Issues Pull Requests Releases 7 Wiki Activity

Compare commits

base: ab-docker:2e26095dbf0c680e0cfb458306b0a1c3e3625a67
Branches Tags
ab-docker:main
ab-docker:1.27-alpine3.20
ab-docker:v5.2-1.23.2
ab-docker:v5.2-1.22.1
ab-docker:5.2-1.21.6
ab-docker:5.2-1.21.3
ab-docker:5.1-1.21.1
ab-docker:5.0-1.21.1
ab-docker:v1.19.9
ab-docker:v2.0.0
...
compare: ab-docker:0ee6ef3fc41d3e1d50208e49737f493435c63cd6
Branches Tags
ab-docker:1.27-alpine3.20
ab-docker:main
ab-docker:v5.2-1.23.2
ab-docker:v5.2-1.22.1
ab-docker:5.2-1.21.6
ab-docker:5.2-1.21.3
ab-docker:5.1-1.21.1
ab-docker:5.0-1.21.1
ab-docker:v1.19.9
ab-docker:v2.0.0

3 Commits
2e26095dbf ... 0ee6ef3fc4

Author SHA1 Message Date
Asif Bacchus
0ee6ef3fc4 chore(dockerfile): bump versions 
- update NGINX to latest version (1.21.3)
- update internal version to 5.2 (bug-fix release)
 2021-09-13 02:45:51 -06:00
Asif Bacchus
30388f81cd fix(dockerfile): create certs directory 
- create certs directory and set permissions for limited user
- required for certs and DHparams auto-generation

Closes #1
 2021-09-13 02:43:28 -06:00
Asif Bacchus
883529d684 fix(scripts): missing space in ab-nginx.sh 2021-09-13 02:13:06 -06:00
2 changed files with 9 additions and 3 deletions
Show Stats Expand all files Collapse all files

10
build/Dockerfile
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.1 ARG NGINX_VERSION=1.21.3
FROM nginx:${NGINX_VERSION}-alpine FROM nginx:${NGINX_VERSION}-alpine
ARG NGINX_VERSION ARG NGINX_VERSION
@ -21,7 +21,10 @@ RUN addgroup --gid ${GID} www-docker \
--uid ${UID} \ --uid ${UID} \
www-docker www-docker
# add libcap, allow nginx to bind to ports <1024, extract fun error pages & create LetsEncrypt challenge directory outside webroot # add libcap and allow nginx to bind to ports <1024;
# 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 \
@ -35,6 +38,7 @@ 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
@ -77,6 +81,8 @@ 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

2
helpers/ab-nginx.sh
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"