Compare commits

..

No commits in common. "222cc916466e49ad03809d00cd555348066dfc94" and "46bb4c02502ac75e801b8d3067582e0c203a4ee2" have entirely different histories.

4 changed files with 9 additions and 23 deletions

View File

@ -11,10 +11,5 @@
<option name="enabled" value="true" /> <option name="enabled" value="true" />
</CommitMessageValidationOverride> </CommitMessageValidationOverride>
</option> </option>
<option name="commitMessageValidationEnabledOverride">
<BoolValueOverride>
<option name="enabled" value="true" />
</BoolValueOverride>
</option>
</component> </component>
</project> </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,21 +1,21 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker"> <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker WSL">
<deployment type="dockerfile"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.11.5-r0" /> <option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.6.11-r0" />
<option name="buildArgs"> <option name="buildArgs">
<list> <list>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="INTERNAL_VERSION" /> <option name="name" value="INTERNAL_VERSION" />
<option name="value" value="2.2" /> <option name="value" value="2.1" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="GIT_COMMIT" /> <option name="name" value="GIT_COMMIT" />
<option name="value" value="a144f7ba10" /> <option name="value" value="3a704c2d2b" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="BUILD_DATE" /> <option name="name" value="BUILD_DATE" />
<option name="value" value="2023-11-01" /> <option name="value" value="2022-12-10" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
</list> </list>
</option> </option>
@ -23,7 +23,7 @@
<option name="sourceFilePath" value="Dockerfile" /> <option name="sourceFilePath" value="Dockerfile" />
</settings> </settings>
</deployment> </deployment>
<EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" /> <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isPublishEnabled="true" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
</component> </component>

View File

@ -3,8 +3,8 @@
# #
# build arguments # build arguments
ARG ALPINE_VERSION="3.18" ARG ALPINE_VERSION="3.17"
ARG MARIADB_VERSION="10.11.5-r0" ARG MARIADB_VERSION="10.6.11-r0"
FROM alpine:${ALPINE_VERSION} FROM alpine:${ALPINE_VERSION}
ARG ALPINE_VERSION ARG ALPINE_VERSION
@ -77,4 +77,4 @@ LABEL org.opencontainers.image.version="${INTERNAL_VERSION}-${MARIADB_VERSION}"
LABEL org.opencontainers.image.revision=${GIT_COMMIT} LABEL org.opencontainers.image.revision=${GIT_COMMIT}
LABEL org.opencontainers.image.created=${BUILD_DATE} LABEL org.opencontainers.image.created=${BUILD_DATE}
#EOF #EOF