Compare commits

..

No commits in common. "ebb989fff3add7c46a5abd773d707fdf71da8a32" and "122aa79c21580a9330226d76a7193e70c7d1d83f" have entirely different histories.

6 changed files with 32 additions and 53 deletions

1
.gitattributes vendored
View File

@ -62,7 +62,6 @@
*.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

@ -1,15 +0,0 @@
<?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>

View File

@ -1,9 +0,0 @@
<?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

@ -1,29 +1,30 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="build/Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker LOCAL"> <configuration default="false" name="build/Dockerfile" type="docker-deploy" factoryName="dockerfile"
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.6" /> <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="2022-02-26" /> <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="cc0343651a" /> <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" /> <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>
<method v="2" /> <method v="2"/>
</configuration> </configuration>
</component> </component>

3
.vscode/numbered-bookmarks.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"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.6 ARG NGINX_VERSION=1.21.3
FROM nginx:${NGINX_VERSION}-alpine FROM nginx:${NGINX_VERSION}-alpine
ARG NGINX_VERSION ARG NGINX_VERSION