Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ebb989fff3 | |||
| 6ef90be311 | |||
| d452e449fb | |||
| cc0343651a | |||
| 122aa79c21 | |||
| 0389744e37 | |||
| b394e6ac21 | |||
| 0ee6ef3fc4 | |||
| 30388f81cd | |||
| 883529d684 |
@@ -62,6 +62,7 @@
|
||||
*.min.css text eol=lf
|
||||
*.js text eol=lf
|
||||
*.min.js text eol=lf
|
||||
*.php text eol=lf
|
||||
|
||||
# Visual Studio projects (Rider also)
|
||||
*.cs diff=csharp
|
||||
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GitToolBoxProjectSettings">
|
||||
<option name="commitMessageIssueKeyValidationOverride">
|
||||
<BoolValueOverride>
|
||||
<option name="enabled" value="true" />
|
||||
</BoolValueOverride>
|
||||
</option>
|
||||
<option name="commitMessageValidationConfigOverride">
|
||||
<CommitMessageValidationOverride>
|
||||
<option name="enabled" value="true" />
|
||||
</CommitMessageValidationOverride>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="MarkdownSettings">
|
||||
<enabledExtensions>
|
||||
<entry key="MermaidLanguageExtension" value="false" />
|
||||
<entry key="PlantUMLLanguageExtension" value="false" />
|
||||
</enabledExtensions>
|
||||
</component>
|
||||
</project>
|
||||
@@ -0,0 +1,29 @@
|
||||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="build/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker LOCAL">
|
||||
<deployment type="dockerfile">
|
||||
<settings>
|
||||
<option name="imageTag" value="docker.asifbacchus.dev/nginx/ab-nginx:5.2-1.21.6" />
|
||||
<option name="buildArgs">
|
||||
<list>
|
||||
<DockerEnvVarImpl>
|
||||
<option name="name" value="BUILD_DATE" />
|
||||
<option name="value" value="2022-02-26" />
|
||||
</DockerEnvVarImpl>
|
||||
<DockerEnvVarImpl>
|
||||
<option name="name" value="GIT_COMMIT" />
|
||||
<option name="value" value="cc0343651a" />
|
||||
</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>
|
||||
Vendored
-3
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"bookmarks": []
|
||||
}
|
||||
+8
-2
@@ -2,7 +2,7 @@
|
||||
# build AB-NGINX container (based on NGINX mainline)
|
||||
#
|
||||
|
||||
ARG NGINX_VERSION=1.21.1
|
||||
ARG NGINX_VERSION=1.21.6
|
||||
FROM nginx:${NGINX_VERSION}-alpine
|
||||
ARG NGINX_VERSION
|
||||
|
||||
@@ -21,7 +21,10 @@ RUN addgroup --gid ${GID} www-docker \
|
||||
--uid ${UID} \
|
||||
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 \
|
||||
libcap \
|
||||
openssl \
|
||||
@@ -35,6 +38,7 @@ RUN apk --update --no-cache add \
|
||||
&& rm -rf /tmp/* \
|
||||
&& rm -rf /docker-entrypoint.d \
|
||||
&& rm -f /docker-entrypoint.sh \
|
||||
&& mkdir /certs \
|
||||
&& mkdir /usr/share/nginx/letsencrypt
|
||||
|
||||
# health check
|
||||
@@ -77,6 +81,8 @@ RUN chown -R www-docker:www-docker /usr/share/nginx \
|
||||
&& find /etc/nginx -type f -exec chmod 640 {} \; \
|
||||
&& chown www-docker:www-docker /var/cache/nginx \
|
||||
&& chown www-docker:www-docker /var/log/nginx \
|
||||
&& chown www-docker:www-docker /certs \
|
||||
&& chmod 700 /certs \
|
||||
&& chmod 644 /etc/selfsigned.cnf \
|
||||
&& chmod 755 /usr/local/bin/generate-cert /usr/local/bin/entrypoint.sh
|
||||
USER www-docker
|
||||
|
||||
+1
-1
@@ -94,7 +94,7 @@ scriptHelp() {
|
||||
# footer
|
||||
newline
|
||||
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 '%.0s-' $(seq "$width")
|
||||
printf "\n%s" "$norm"
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
resolver
|
||||
127.0.0.11;
|
||||
Reference in New Issue
Block a user