Compare commits

..

No commits in common. "main" and "v2.2-10.11.5r0" have entirely different histories.

3 changed files with 8 additions and 24 deletions

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitCommitMessageStorage">
<option name="messageStorage">
<MessageStorage />
</option>
</component>
</project>

View File

@ -1,29 +1,21 @@
<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">
<deployment type="dockerfile">
<settings>
<option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.11.6-r0" />
<option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.11.5-r0" />
<option name="buildArgs">
<list>
<DockerEnvVarImpl>
<option name="name" value="ALPINE_VERSION" />
<option name="value" value="3.19" />
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="MARIADB_VERSION" />
<option name="value" value="10.11.6-r0" />
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="INTERNAL_VERSION" />
<option name="value" value="2.2.1" />
<option name="value" value="2.2" />
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="GIT_COMMIT" />
<option name="value" value="1e1fccea11" />
<option name="value" value="a144f7ba10" />
</DockerEnvVarImpl>
<DockerEnvVarImpl>
<option name="name" value="BUILD_DATE" />
<option name="value" value="2024-01-27" />
<option name="value" value="2023-11-01" />
</DockerEnvVarImpl>
</list>
</option>

View File

@ -3,8 +3,8 @@
#
# build arguments
ARG ALPINE_VERSION="3.19"
ARG MARIADB_VERSION="10.11.6-r0"
ARG ALPINE_VERSION="3.18"
ARG MARIADB_VERSION="10.11.5-r0"
FROM alpine:${ALPINE_VERSION}
ARG ALPINE_VERSION
@ -40,7 +40,7 @@ VOLUME ["/var/lib/mysql"]
HEALTHCHECK \
--interval=30s \
--timeout=10s \
--start-period=5s \
--start-period=30s \
--retries=3 \
CMD mysqladmin ping --silent