Skip to content
Snippets Groups Projects
Commit 717ef929 authored by Dominic Taylor's avatar Dominic Taylor
Browse files

Merge branch 'mariadb-vars' into 'master' 

Update to check for MARIADB_ vars and also secrets

See merge request docker/alpine-mariadb!29
parents d6b3e80d a08a9648
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
alpine-mariadb-aarch64/files/run.sh
+ 36
− 16
View file @ 717ef929
#!/bin/sh
# Set MYSQL_ variables based on MARIADB_ variables if they exist
[ -n "$MARIADB_ROOT_PASSWORD" ] && export MYSQL_ROOT_PASSWORD="$MARIADB_ROOT_PASSWORD"
[ -n "$MARIADB_DATABASE" ] && export MYSQL_DATABASE="$MARIADB_DATABASE"
[ -n "$MARIADB_USER" ] && export MYSQL_USER="$MARIADB_USER"
[ -n "$MARIADB_PASSWORD" ] && export MYSQL_PASSWORD="$MARIADB_PASSWORD"
[ -n "$MARIADB_CHARSET" ] && export MYSQL_CHARSET="$MARIADB_CHARSET"
[ -n "$MARIADB_COLLATION" ] && export MYSQL_COLLATION="$MARIADB_COLLATION"
# Function to read secret from file
read_secret() {
local secret_file="$1"
if [ -f "$secret_file" ]; then
if [ -r "$secret_file" ]; then
cat "$secret_file"
else
echo "[ERROR] Secret file $secret_file is not readable" >&2
return 1
fi
if [ -f "$secret_file" ] && [ -r "$secret_file" ]; then
cat "$secret_file"
else
echo "[WARNING] Secret file $secret_file does not exist" >&2
echo ""
fi
}
# Set MYSQL_ variables based on MARIADB_ variables or secrets if MYSQL_ is not set
for var in ROOT_PASSWORD DATABASE USER PASSWORD CHARSET COLLATION; do
mysql_var="MYSQL_${var}"
mariadb_var="MARIADB_${var}"
# Check environment variables
if [ -z "${!mysql_var}" ] && [ -n "${!mariadb_var}" ]; then
export "$mysql_var"="${!mariadb_var}"
fi
# Check secrets
mysql_secret="/run/secrets/mysql_${var,,}"
mariadb_secret="/run/secrets/mariadb_${var,,}"
if [ -z "${!mysql_var}" ] && [ -f "$mariadb_secret" ]; then
export "$mysql_var"=$(read_secret "$mariadb_secret")
elif [ -z "${!mysql_var}" ] && [ -f "$mysql_secret" ]; then
export "$mysql_var"=$(read_secret "$mysql_secret")
fi
done
# Handle *_FILE variables
for var in ROOT_PASSWORD DATABASE USER PASSWORD; do
mysql_var="MYSQL_${var}"
mysql_file_var="MYSQL_${var}_FILE"
mariadb_file_var="MARIADB_${var}_FILE"
if [ -z "${!mysql_var}" ] && [ -n "${!mysql_file_var}" ]; then
export "$mysql_var"=$(read_secret "${!mysql_file_var}")
elif [ -z "${!mysql_var}" ] && [ -n "${!mariadb_file_var}" ]; then
export "$mysql_var"=$(read_secret "${!mariadb_file_var}")
fi
done
# execute any pre-init scripts
for i in /scripts/pre-init.d/*sh
do
......
alpine-mariadb-amd64/files/run.sh
+ 36
− 16
View file @ 717ef929
#!/bin/sh
# Set MYSQL_ variables based on MARIADB_ variables if they exist
[ -n "$MARIADB_ROOT_PASSWORD" ] && export MYSQL_ROOT_PASSWORD="$MARIADB_ROOT_PASSWORD"
[ -n "$MARIADB_DATABASE" ] && export MYSQL_DATABASE="$MARIADB_DATABASE"
[ -n "$MARIADB_USER" ] && export MYSQL_USER="$MARIADB_USER"
[ -n "$MARIADB_PASSWORD" ] && export MYSQL_PASSWORD="$MARIADB_PASSWORD"
[ -n "$MARIADB_CHARSET" ] && export MYSQL_CHARSET="$MARIADB_CHARSET"
[ -n "$MARIADB_COLLATION" ] && export MYSQL_COLLATION="$MARIADB_COLLATION"
# Function to read secret from file
read_secret() {
local secret_file="$1"
if [ -f "$secret_file" ]; then
if [ -r "$secret_file" ]; then
cat "$secret_file"
else
echo "[ERROR] Secret file $secret_file is not readable" >&2
return 1
fi
if [ -f "$secret_file" ] && [ -r "$secret_file" ]; then
cat "$secret_file"
else
echo "[WARNING] Secret file $secret_file does not exist" >&2
echo ""
fi
}
# Set MYSQL_ variables based on MARIADB_ variables or secrets if MYSQL_ is not set
for var in ROOT_PASSWORD DATABASE USER PASSWORD CHARSET COLLATION; do
mysql_var="MYSQL_${var}"
mariadb_var="MARIADB_${var}"
# Check environment variables
if [ -z "${!mysql_var}" ] && [ -n "${!mariadb_var}" ]; then
export "$mysql_var"="${!mariadb_var}"
fi
# Check secrets
mysql_secret="/run/secrets/mysql_${var,,}"
mariadb_secret="/run/secrets/mariadb_${var,,}"
if [ -z "${!mysql_var}" ] && [ -f "$mariadb_secret" ]; then
export "$mysql_var"=$(read_secret "$mariadb_secret")
elif [ -z "${!mysql_var}" ] && [ -f "$mysql_secret" ]; then
export "$mysql_var"=$(read_secret "$mysql_secret")
fi
done
# Handle *_FILE variables
for var in ROOT_PASSWORD DATABASE USER PASSWORD; do
mysql_var="MYSQL_${var}"
mysql_file_var="MYSQL_${var}_FILE"
mariadb_file_var="MARIADB_${var}_FILE"
if [ -z "${!mysql_var}" ] && [ -n "${!mysql_file_var}" ]; then
export "$mysql_var"=$(read_secret "${!mysql_file_var}")
elif [ -z "${!mysql_var}" ] && [ -n "${!mariadb_file_var}" ]; then
export "$mysql_var"=$(read_secret "${!mariadb_file_var}")
fi
done
# execute any pre-init scripts
for i in /scripts/pre-init.d/*sh
do
......
alpine-mariadb-armhf/files/run.sh
+ 36
− 16
View file @ 717ef929
#!/bin/sh
# Set MYSQL_ variables based on MARIADB_ variables if they exist
[ -n "$MARIADB_ROOT_PASSWORD" ] && export MYSQL_ROOT_PASSWORD="$MARIADB_ROOT_PASSWORD"
[ -n "$MARIADB_DATABASE" ] && export MYSQL_DATABASE="$MARIADB_DATABASE"
[ -n "$MARIADB_USER" ] && export MYSQL_USER="$MARIADB_USER"
[ -n "$MARIADB_PASSWORD" ] && export MYSQL_PASSWORD="$MARIADB_PASSWORD"
[ -n "$MARIADB_CHARSET" ] && export MYSQL_CHARSET="$MARIADB_CHARSET"
[ -n "$MARIADB_COLLATION" ] && export MYSQL_COLLATION="$MARIADB_COLLATION"
# Function to read secret from file
read_secret() {
local secret_file="$1"
if [ -f "$secret_file" ]; then
if [ -r "$secret_file" ]; then
cat "$secret_file"
else
echo "[ERROR] Secret file $secret_file is not readable" >&2
return 1
fi
if [ -f "$secret_file" ] && [ -r "$secret_file" ]; then
cat "$secret_file"
else
echo "[WARNING] Secret file $secret_file does not exist" >&2
echo ""
fi
}
# Set MYSQL_ variables based on MARIADB_ variables or secrets if MYSQL_ is not set
for var in ROOT_PASSWORD DATABASE USER PASSWORD CHARSET COLLATION; do
mysql_var="MYSQL_${var}"
mariadb_var="MARIADB_${var}"
# Check environment variables
if [ -z "${!mysql_var}" ] && [ -n "${!mariadb_var}" ]; then
export "$mysql_var"="${!mariadb_var}"
fi
# Check secrets
mysql_secret="/run/secrets/mysql_${var,,}"
mariadb_secret="/run/secrets/mariadb_${var,,}"
if [ -z "${!mysql_var}" ] && [ -f "$mariadb_secret" ]; then
export "$mysql_var"=$(read_secret "$mariadb_secret")
elif [ -z "${!mysql_var}" ] && [ -f "$mysql_secret" ]; then
export "$mysql_var"=$(read_secret "$mysql_secret")
fi
done
# Handle *_FILE variables
for var in ROOT_PASSWORD DATABASE USER PASSWORD; do
mysql_var="MYSQL_${var}"
mysql_file_var="MYSQL_${var}_FILE"
mariadb_file_var="MARIADB_${var}_FILE"
if [ -z "${!mysql_var}" ] && [ -n "${!mysql_file_var}" ]; then
export "$mysql_var"=$(read_secret "${!mysql_file_var}")
elif [ -z "${!mysql_var}" ] && [ -n "${!mariadb_file_var}" ]; then
export "$mysql_var"=$(read_secret "${!mariadb_file_var}")
fi
done
# execute any pre-init scripts
for i in /scripts/pre-init.d/*sh
do
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment