Compare commits

..

3 Commits

Author SHA1 Message Date
49ec1145df build(docker): Update build config 2024-01-27 17:34:18 -07:00
1e1fccea11 feat(dockerfile): Reduce healthcheck timeout
Reduce start period to 5s for faster dependency checks.
2024-01-27 17:31:15 -07:00
2ef5cc7752 feat(dockerfile): Update base versions
Update base Alpine version to 3.19 and MariaDb to 10.11.6-r0
2024-01-27 17:30:23 -07:00
3 changed files with 24 additions and 8 deletions

View File

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

View File

@ -1,21 +1,29 @@
<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.11.6-r0" />
<option name="buildArgs"> <option name="buildArgs">
<list> <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> <DockerEnvVarImpl>
<option name="name" value="INTERNAL_VERSION" /> <option name="name" value="INTERNAL_VERSION" />
<option name="value" value="2.2" /> <option name="value" value="2.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="1e1fccea11" />
</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="2024-01-27" />
</DockerEnvVarImpl> </DockerEnvVarImpl>
</list> </list>
</option> </option>

View File

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