Compare commits

...

9 Commits

8 changed files with 71 additions and 33 deletions

1
.gitattributes vendored
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

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> </option>
</component> </component>
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>

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">
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-1.25.1" />
<option name="imageTag" value="docker.asifbacchus.dev/nginx/ab-nginx:5.2-1.21.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="2023-08-10" />
<option name="value" value="2021-09-13"/> </DockerEnvVarImpl>
</DockerEnvVarImpl> <DockerEnvVarImpl>
<DockerEnvVarImpl> <option name="name" value="GIT_COMMIT" />
<option name="name" value="GIT_COMMIT"/> <option name="value" value="9a1153e93c" />
<option name="value" value="0ee6ef3fc4"/> </DockerEnvVarImpl>
</DockerEnvVarImpl> <DockerEnvVarImpl>
<DockerEnvVarImpl> <option name="name" value="INTERNAL_VERSION" />
<option name="name" value="INTERNAL_VERSION"/> <option name="value" value="5.2.1" />
<option name="value" value="5.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> <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
<method v="2"/> <method v="2" />
</configuration> </configuration>
</component> </component>

View File

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

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.3 ARG NGINX_VERSION=1.25.1
FROM nginx:${NGINX_VERSION}-alpine FROM nginx:${NGINX_VERSION}-alpine
ARG NGINX_VERSION ARG NGINX_VERSION