public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2025-12-21 05:41:31 +00:00
Code Issues Releases Wiki Activity

Check if mysql has been initialized before trying to upgrade

Browse Source
This commit is contained in:
FreddleSpl0it
2025-05-31 21:50:49 +02:00
parent 744aa5d137
commit 743bfcec60
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
data/Dockerfiles/bootstrap/modules/BootstrapMysql.py
View File

@@ -10,19 +10,21 @@ class BootstrapMysql(BootstrapBase):
dbpass = os.getenv("MYSQL_ROOT_PASSWORD", "") dbpass = os.getenv("MYSQL_ROOT_PASSWORD", "")
socket = "/tmp/mysql-temp.sock" socket = "/tmp/mysql-temp.sock"
print("Starting temporary mysqld for upgrade...") # Check if mysql has been initialized
self.start_temporary(socket) if os.path.exists("/var/lib/mysql/mysql/db.frm"):
print("Starting temporary mysqld for upgrade...")
self.start_temporary(socket)
self.connect_mysql(socket) self.connect_mysql(socket)
print("Running mysql_upgrade...") print("Running mysql_upgrade...")
self.upgrade_mysql(dbuser, dbpass, socket) self.upgrade_mysql(dbuser, dbpass, socket)
print("Checking timezone support with CONVERT_TZ...") print("Checking timezone support with CONVERT_TZ...")
self.check_and_import_timezone_support(dbuser, dbpass, socket) self.check_and_import_timezone_support(dbuser, dbpass, socket)
print("Shutting down temporary mysqld...") print("Shutting down temporary mysqld...")
self.close_mysql() self.close_mysql()
self.stop_temporary(dbuser, dbpass, socket) self.stop_temporary(dbuser, dbpass, socket)
# Setup Jinja2 Environment and load vars # Setup Jinja2 Environment and load vars

1
data/Dockerfiles/mariadb/Dockerfile
View File

@@ -7,7 +7,6 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
python3 \ python3 \
python3-pip \ python3-pip \
gosu \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

2
data/Dockerfiles/mariadb/docker-entrypoint.sh
View File

@@ -17,4 +17,4 @@ if [ $BOOTSTRAP_EXIT_CODE -ne 0 ]; then
fi fi
echo "Bootstrap succeeded. Starting MariaDB..." echo "Bootstrap succeeded. Starting MariaDB..."
exec gosu mysql "$@" exec /usr/local/bin/docker-entrypoint.sh "$@"