7 Commits

Author SHA1 Message Date
asif 122aa79c21 feature(helpers): add disabled local resolver config
- add local resolver for reference
- disabled by default, use Cloudflare instead
2021-09-13 04:13:53 -06:00
asif 0389744e37 chore: convert all files to LF 2021-09-13 04:10:56 -06:00
asif b394e6ac21 chore(rider): save dockerfile build configuration 2021-09-13 03:25:39 -06:00
asif 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 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 883529d684 fix(scripts): missing space in ab-nginx.sh 2021-09-13 02:13:06 -06:00
asif 2e26095dbf update curl and apk-tools to address security issues 2021-07-27 23:18:17 -06:00
4 changed files with 42 additions and 3 deletions
+30
View File
@@ -0,0 +1,30 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="build/Dockerfile" type="docker-deploy" factoryName="dockerfile"
server-name="Docker on CODE">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="docker.asifbacchus.dev/nginx/ab-nginx:5.2-1.21.3"/>
<option name="buildArgs">
<list>
<DockerEnvVarImpl>
<option name="name" value="BUILD_DATE"/>
<option name="value" value="2021-09-13"/>
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="GIT_COMMIT"/>
<option name="value" value="0ee6ef3fc4"/>
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="INTERNAL_VERSION"/>
<option name="value" value="5.2"/>
</DockerEnvVarImpl>
</list>
</option>
<option name="buildOnly" value="true"/>
<option name="containerName" value=""/>
<option name="sourceFilePath" value="build/Dockerfile"/>
</settings>
</deployment>
<method v="2"/>
</configuration>
</component>
+9 -2
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,10 +21,14 @@ 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 \
&& apk --update --no-cache upgrade \
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \ && setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
&& cd /usr/share/nginx \ && cd /usr/share/nginx \
&& rm -rf html/* \ && rm -rf html/* \
@@ -34,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
@@ -76,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
+1 -1
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"
@@ -0,0 +1,2 @@
resolver
127.0.0.11;