Compare commits
16 Commits
5.0-1.21.1
...
main
Author | SHA1 | Date |
---|---|---|
Asif Bacchus | e8d1407419 | |
Asif Bacchus | 9a1153e93c | |
Asif Bacchus | a8fc01f885 | |
Asif Bacchus | f2c63513e8 | |
Asif Bacchus | e7f83a8adc | |
Asif Bacchus | ebb989fff3 | |
Asif Bacchus | 6ef90be311 | |
Asif Bacchus | d452e449fb | |
Asif Bacchus | cc0343651a | |
Asif Bacchus | 122aa79c21 | |
Asif Bacchus | 0389744e37 | |
Asif Bacchus | b394e6ac21 | |
Asif Bacchus | 0ee6ef3fc4 | |
Asif Bacchus | 30388f81cd | |
Asif Bacchus | 883529d684 | |
Asif Bacchus | 2e26095dbf |
|
@ -62,6 +62,7 @@
|
||||||
*.min.css text eol=lf
|
*.min.css text eol=lf
|
||||||
*.js text eol=lf
|
*.js text eol=lf
|
||||||
*.min.js text eol=lf
|
*.min.js text eol=lf
|
||||||
|
*.php text eol=lf
|
||||||
|
|
||||||
# Visual Studio projects (Rider also)
|
# Visual Studio projects (Rider also)
|
||||||
*.cs diff=csharp
|
*.cs diff=csharp
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="accountSettings">
|
||||||
|
<option name="activeRegion" value="us-east-1" />
|
||||||
|
<option name="recentlyUsedRegions">
|
||||||
|
<list>
|
||||||
|
<option value="us-east-1" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
|
@ -0,0 +1,20 @@
|
||||||
|
<?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>
|
||||||
|
<option name="commitMessageValidationEnabledOverride">
|
||||||
|
<BoolValueOverride>
|
||||||
|
<option name="enabled" value="true" />
|
||||||
|
</BoolValueOverride>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
|
@ -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>
|
|
@ -15,6 +15,6 @@
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsDirectoryMappings">
|
<component name="VcsDirectoryMappings">
|
||||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
<mapping directory="" vcs="Git" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
|
@ -0,0 +1,30 @@
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="build/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
|
||||||
|
<deployment type="dockerfile">
|
||||||
|
<settings>
|
||||||
|
<option name="imageTag" value="docker.asifbacchus.dev/nginx/ab-nginx:5.2.1-1.25.1" />
|
||||||
|
<option name="buildArgs">
|
||||||
|
<list>
|
||||||
|
<DockerEnvVarImpl>
|
||||||
|
<option name="name" value="BUILD_DATE" />
|
||||||
|
<option name="value" value="2023-08-10" />
|
||||||
|
</DockerEnvVarImpl>
|
||||||
|
<DockerEnvVarImpl>
|
||||||
|
<option name="name" value="GIT_COMMIT" />
|
||||||
|
<option name="value" value="9a1153e93c" />
|
||||||
|
</DockerEnvVarImpl>
|
||||||
|
<DockerEnvVarImpl>
|
||||||
|
<option name="name" value="INTERNAL_VERSION" />
|
||||||
|
<option name="value" value="5.2.1" />
|
||||||
|
</DockerEnvVarImpl>
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
<option name="buildOnly" value="true" />
|
||||||
|
<option name="containerName" value="" />
|
||||||
|
<option name="sourceFilePath" value="build/Dockerfile" />
|
||||||
|
</settings>
|
||||||
|
</deployment>
|
||||||
|
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"bookmarks": []
|
|
||||||
}
|
|
|
@ -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.25.1
|
||||||
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
|
||||||
|
|
|
@ -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;
|
Loading…
Reference in New Issue