Compare commits
No commits in common. "c415496f007ef6a9e65bb259c9d84cefd596b03f" and "f0efa2b9fcd569a630266b246beb9ac05a1f2094" have entirely different histories.
c415496f00
...
f0efa2b9fc
@ -1,7 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="RiderProjectSettingsUpdater">
|
<component name="RiderProjectSettingsUpdater">
|
||||||
<option name="singleClickDiffPreview" value="1" />
|
|
||||||
<option name="vcsConfiguration" value="3" />
|
<option name="vcsConfiguration" value="3" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
@ -2,28 +2,28 @@
|
|||||||
<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 (WSL)">
|
||||||
<deployment type="dockerfile">
|
<deployment type="dockerfile">
|
||||||
<settings>
|
<settings>
|
||||||
<option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:11.4.4-r1" />
|
<option name="imageTag" value="docker.asifbacchus.dev/mariadb/ab-mariadb-alpine:10.11.8-r0" />
|
||||||
<option name="buildArgs">
|
<option name="buildArgs">
|
||||||
<list>
|
<list>
|
||||||
<DockerEnvVarImpl>
|
<DockerEnvVarImpl>
|
||||||
<option name="name" value="ALPINE_VERSION" />
|
<option name="name" value="ALPINE_VERSION" />
|
||||||
<option name="value" value="3.21" />
|
<option name="value" value="3.20" />
|
||||||
</DockerEnvVarImpl>
|
</DockerEnvVarImpl>
|
||||||
<DockerEnvVarImpl>
|
<DockerEnvVarImpl>
|
||||||
<option name="name" value="MARIADB_VERSION" />
|
<option name="name" value="MARIADB_VERSION" />
|
||||||
<option name="value" value="11.4.4-r1" />
|
<option name="value" value="10.11.8-r0" />
|
||||||
</DockerEnvVarImpl>
|
</DockerEnvVarImpl>
|
||||||
<DockerEnvVarImpl>
|
<DockerEnvVarImpl>
|
||||||
<option name="name" value="INTERNAL_VERSION" />
|
<option name="name" value="INTERNAL_VERSION" />
|
||||||
<option name="value" value="2.3.0" />
|
<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="8a6df0d489" />
|
<option name="value" value="117a308944" />
|
||||||
</DockerEnvVarImpl>
|
</DockerEnvVarImpl>
|
||||||
<DockerEnvVarImpl>
|
<DockerEnvVarImpl>
|
||||||
<option name="name" value="BUILD_DATE" />
|
<option name="name" value="BUILD_DATE" />
|
||||||
<option name="value" value="2025-01-24" />
|
<option name="value" value="2024-09-07" />
|
||||||
</DockerEnvVarImpl>
|
</DockerEnvVarImpl>
|
||||||
</list>
|
</list>
|
||||||
</option>
|
</option>
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# build arguments
|
# build arguments
|
||||||
ARG ALPINE_VERSION="3.21"
|
ARG ALPINE_VERSION="3.20"
|
||||||
ARG MARIADB_VERSION="11.4.4-r1"
|
ARG MARIADB_VERSION="10.11.8-r0"
|
||||||
|
|
||||||
FROM alpine:${ALPINE_VERSION}
|
FROM alpine:${ALPINE_VERSION}
|
||||||
ARG ALPINE_VERSION
|
ARG ALPINE_VERSION
|
||||||
@ -39,7 +39,7 @@ VOLUME ["/var/lib/mysql"]
|
|||||||
# basic healthcheck (service only)
|
# basic healthcheck (service only)
|
||||||
HEALTHCHECK \
|
HEALTHCHECK \
|
||||||
--interval=30s \
|
--interval=30s \
|
||||||
--timeout=5s \
|
--timeout=10s \
|
||||||
--start-period=5s \
|
--start-period=5s \
|
||||||
--retries=3 \
|
--retries=3 \
|
||||||
CMD mysqladmin ping --silent
|
CMD mysqladmin ping --silent
|
||||||
|
@ -86,7 +86,7 @@ if [ -z "$(ls -A /var/lib/mysql/ 2> /dev/null)" ]; then
|
|||||||
|
|
||||||
# create system tables
|
# create system tables
|
||||||
printf "DB-CREATE: Setting up mySQL system tables\n"
|
printf "DB-CREATE: Setting up mySQL system tables\n"
|
||||||
if (! mariadb-install-db --user=mysql --ldata=/var/lib/mysql > /dev/null); then
|
if (! mysql_install_db --user=mysql --ldata=/var/lib/mysql > /dev/null); then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -113,7 +113,7 @@ if [ -z "$(ls -A /var/lib/mysql/ 2> /dev/null)" ]; then
|
|||||||
|
|
||||||
# execute statements against mariadb and cleanup
|
# execute statements against mariadb and cleanup
|
||||||
printf "DB-CREATE: Bootstrapping mySQL database\n"
|
printf "DB-CREATE: Bootstrapping mySQL database\n"
|
||||||
if (! mariadbd --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$sqlCmd"); then
|
if (! mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$sqlCmd"); then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
shred -u "$sqlCmd"
|
shred -u "$sqlCmd"
|
||||||
@ -129,7 +129,7 @@ for f in /docker-entrypoint-initdb.d/*; do
|
|||||||
*.sql)
|
*.sql)
|
||||||
if [ -s "$f" ]; then
|
if [ -s "$f" ]; then
|
||||||
printf "IMPORT-SQL: Importing %s\n" "$f"
|
printf "IMPORT-SQL: Importing %s\n" "$f"
|
||||||
if (! mariadbd --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"); then
|
if (! mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0 < "$f"); then
|
||||||
exit 3
|
exit 3
|
||||||
fi
|
fi
|
||||||
printf "\n"
|
printf "\n"
|
||||||
@ -138,7 +138,7 @@ for f in /docker-entrypoint-initdb.d/*; do
|
|||||||
*.sql.gz)
|
*.sql.gz)
|
||||||
if [ -s "$f" ]; then
|
if [ -s "$f" ]; then
|
||||||
printf "IMPORT-SQL: Importing %s\n" "$f"
|
printf "IMPORT-SQL: Importing %s\n" "$f"
|
||||||
if (! gunzip -c "$f" | mariadbd --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0); then
|
if (! gunzip -c "$f" | mysqld --user=mysql --bootstrap --verbose=0 --skip-name-resolve --skip-networking=0); then
|
||||||
exit 3
|
exit 3
|
||||||
fi
|
fi
|
||||||
printf "\n"
|
printf "\n"
|
||||||
@ -168,8 +168,8 @@ fi
|
|||||||
# process CMD sent to this container
|
# process CMD sent to this container
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-*)
|
-*)
|
||||||
# param starts with '-' --> assume mariadbd parameter(s) and append to CMD
|
# param starts with '-' --> assume mysqld parameter(s) and append to CMD
|
||||||
set -- /usr/bin/mariadbd --user=mysql --console "$@"
|
set -- /usr/bin/mysqld --user=mysql --console "$@"
|
||||||
printf "\nExecuting: %s\n" "$*"
|
printf "\nExecuting: %s\n" "$*"
|
||||||
exec "$@"
|
exec "$@"
|
||||||
;;
|
;;
|
||||||
|
Loading…
Reference in New Issue
Block a user