18 Commits

Author SHA1 Message Date
asif 820e2a1137 chore(ide): Update docker build args 2025-01-10 13:40:27 -07:00
asif e9a0a3bb15 refactor(dockerfile): Remove deprecated labels
Remove maintainer-related labels as they've been long superseded by
opencontainers-author label.
2025-01-10 13:39:08 -07:00
asif 41a1506ee7 chore(ide): Delete old git plugin data 2025-01-10 13:38:13 -07:00
asif 804e52aac2 chore(git): Update ignored files
Ignore IDE git plugin generated files.
2025-01-10 13:37:50 -07:00
asif 0385f2699d chore(ide): Update ide settings
Update git and project tracking settings.
2025-01-10 13:35:30 -07:00
asif 666cc8a592 feat(dockerfile): Increment nginx base to 1.27.3 2025-01-10 13:34:40 -07:00
asif 87b4092177 build(dockerfile): Update build args 2024-08-31 18:15:13 -06:00
asif 9d7c079c97 build(ide): Update IDE settings 2024-08-31 18:07:35 -06:00
asif 9104126356 feat(nginx): Update version to 1.27 on Alpine 3.20 2024-08-31 18:06:13 -06:00
asif e8d1407419 build(docker): update build vars 2023-08-10 17:09:47 -06:00
asif 9a1153e93c feature(nginx): update default base version 2023-08-10 17:01:32 -06:00
asif a8fc01f885 chore(ide): update build config 2022-11-02 01:11:00 -06:00
asif f2c63513e8 feature(version): build for mainline 1.23.2 2022-11-02 01:10:04 -06:00
asif e7f83a8adc feature(version): build for stable 1.22.1 2022-11-02 01:06:11 -06:00
asif ebb989fff3 chore(ide): update docker build args 2022-02-26 23:21:12 -07:00
asif 6ef90be311 chore(ide): remove vscode files 2022-02-26 23:19:07 -07:00
asif d452e449fb chore(git): update gitattributes 2022-02-26 23:18:43 -07:00
asif cc0343651a chore(dockerfile): bump underlying nginx version 2022-02-26 23:17:45 -07:00
14 changed files with 124 additions and 36 deletions
+1
View File
@@ -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
+1
View File
@@ -11,6 +11,7 @@
# Generated files # Generated files
.idea/**/contentModel.xml .idea/**/contentModel.xml
.idea/**/GitCommitMessageStorage.xml
# Sensitive or high-churn files # Sensitive or high-churn files
.idea/**/dataSources/ .idea/**/dataSources/
+11
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>
+20
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>
+9
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>
+1 -1
View File
@@ -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>
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitToolBoxBlameSettings">
<option name="version" value="2" />
</component>
</project>
+15
View File
@@ -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="commitMessageValidationEnabledOverride">
<BoolValueOverride>
<option name="enabled" value="true" />
</BoolValueOverride>
</option>
</component>
</project>
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RiderProjectSettingsUpdater">
<option name="singleClickDiffPreview" value="1" />
<option name="vcsConfiguration" value="3" />
</component>
</project>
Generated
+15
View File
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CommitMessageInspectionProfile">
<profile version="1.0">
<inspection_tool class="BodyLimit" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="SubjectBodySeparation" enabled="true" level="ERROR" enabled_by_default="true" />
<inspection_tool class="SubjectLimit" enabled="true" level="WARNING" enabled_by_default="true">
<option name="RIGHT_MARGIN" value="50" />
</inspection_tool>
</profile>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
+13 -13
View File
@@ -1,30 +1,30 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="build/Dockerfile" type="docker-deploy" factoryName="dockerfile" <configuration default="false" name="build/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker (WSL)">
server-name="Docker on CODE">
<deployment type="dockerfile"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="docker.asifbacchus.dev/nginx/ab-nginx:5.2-1.21.3"/> <option name="imageTag" value="docker.asifbacchus.dev/nginx/ab-nginx:5.2.1-1.27.3" />
<option name="buildArgs"> <option name="buildArgs">
<list> <list>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="BUILD_DATE"/> <option name="name" value="BUILD_DATE" />
<option name="value" value="2021-09-13"/> <option name="value" value="2025-01-10" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="GIT_COMMIT"/> <option name="name" value="GIT_COMMIT" />
<option name="value" value="0ee6ef3fc4"/> <option name="value" value="e9a0a3bb15" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="INTERNAL_VERSION"/> <option name="name" value="INTERNAL_VERSION" />
<option name="value" value="5.2"/> <option name="value" value="5.2.1.2" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
</list> </list>
</option> </option>
<option name="buildOnly" value="true"/> <option name="buildOnly" value="true" />
<option name="containerName" value=""/> <option name="containerName" value="" />
<option name="sourceFilePath" value="build/Dockerfile"/> <option name="sourceFilePath" value="build/Dockerfile" />
</settings> </settings>
</deployment> </deployment>
<method v="2"/> <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
<method v="2" />
</configuration> </configuration>
</component> </component>
-3
View File
@@ -1,3 +0,0 @@
{
"bookmarks": []
}
+2 -4
View File
@@ -1,8 +1,8 @@
# #
# build AB-NGINX container (based on NGINX mainline) # build AB-NGINX container (based on NGINX mainline on Alpine linux)
# #
ARG NGINX_VERSION=1.21.3 ARG NGINX_VERSION=1.27.3
FROM nginx:${NGINX_VERSION}-alpine FROM nginx:${NGINX_VERSION}-alpine
ARG NGINX_VERSION ARG NGINX_VERSION
@@ -50,8 +50,6 @@ HEALTHCHECK \
CMD curl --fail http://127.0.0.1:9000/nginx_status || exit 1 CMD curl --fail http://127.0.0.1:9000/nginx_status || exit 1
# standardized labels # standardized labels
MAINTAINER Asif Bacchus <asif@asifbacchus.dev>
LABEL maintainer="Asif Bacchus <asif@asifbacchus.dev>"
LABEL dev.asifbacchus.docker.internalName="ab-nginx" LABEL dev.asifbacchus.docker.internalName="ab-nginx"
LABEL org.opencontainers.image.author="Asif Bacchus <asif@asifbacchus.dev>" LABEL org.opencontainers.image.author="Asif Bacchus <asif@asifbacchus.dev>"
LABEL org.opencontainers.image.url="https://git.asifbacchus.dev/ab-docker/ab-nginx" LABEL org.opencontainers.image.url="https://git.asifbacchus.dev/ab-docker/ab-nginx"