Compare commits

..

No commits in common. "46bb4c02502ac75e801b8d3067582e0c203a4ee2" and "377a47c84c19e63fc365b48897a0f96b098207fc" have entirely different histories.

2 changed files with 6 additions and 7 deletions

View File

@ -1,8 +1,8 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker WSL"> <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker LOCAL">
<deployment type="dockerfile"> <deployment type="dockerfile">
<settings> <settings>
<option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.6.11-r0" /> <option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.6.4-r2" />
<option name="buildArgs"> <option name="buildArgs">
<list> <list>
<DockerEnvVarImpl> <DockerEnvVarImpl>
@ -11,11 +11,11 @@
</DockerEnvVarImpl> </DockerEnvVarImpl>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="GIT_COMMIT" /> <option name="name" value="GIT_COMMIT" />
<option name="value" value="3a704c2d2b" /> <option name="value" value="277bff0c06" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
<DockerEnvVarImpl> <DockerEnvVarImpl>
<option name="name" value="BUILD_DATE" /> <option name="name" value="BUILD_DATE" />
<option name="value" value="2022-12-10" /> <option name="value" value="2022-02-19" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
</list> </list>
</option> </option>
@ -23,7 +23,6 @@
<option name="sourceFilePath" value="Dockerfile" /> <option name="sourceFilePath" value="Dockerfile" />
</settings> </settings>
</deployment> </deployment>
<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.17" ARG ALPINE_VERSION="3.15"
ARG MARIADB_VERSION="10.6.11-r0" ARG MARIADB_VERSION="10.6.4-r2"
FROM alpine:${ALPINE_VERSION} FROM alpine:${ALPINE_VERSION}
ARG ALPINE_VERSION ARG ALPINE_VERSION