Compare commits

...

15 Commits

Author SHA1 Message Date
Asif Bacchus e8d1407419 build(docker): update build vars 2023-08-10 17:09:47 -06:00
Asif Bacchus 9a1153e93c feature(nginx): update default base version 2023-08-10 17:01:32 -06:00
Asif Bacchus a8fc01f885 chore(ide): update build config 2022-11-02 01:11:00 -06:00
Asif Bacchus f2c63513e8 feature(version): build for mainline 1.23.2 2022-11-02 01:10:04 -06:00
Asif Bacchus e7f83a8adc feature(version): build for stable 1.22.1 2022-11-02 01:06:11 -06:00
Asif Bacchus ebb989fff3 chore(ide): update docker build args 2022-02-26 23:21:12 -07:00
Asif Bacchus 6ef90be311 chore(ide): remove vscode files 2022-02-26 23:19:07 -07:00
Asif Bacchus d452e449fb chore(git): update gitattributes 2022-02-26 23:18:43 -07:00
Asif Bacchus cc0343651a chore(dockerfile): bump underlying nginx version 2022-02-26 23:17:45 -07:00
Asif Bacchus 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 Bacchus 0389744e37 chore: convert all files to LF 2021-09-13 04:10:56 -06:00
Asif Bacchus b394e6ac21 chore(rider): save dockerfile build configuration 2021-09-13 03:25:39 -06:00
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
10 changed files with 83 additions and 7 deletions

1
.gitattributes vendored
View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -15,6 +15,6 @@
</option>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -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>

View File

@ -1,3 +0,0 @@
{
"bookmarks": []
}

View File

@ -2,7 +2,7 @@
# 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
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

View File

@ -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"

View File

@ -0,0 +1,2 @@
resolver
127.0.0.11;