Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-21 23:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update mariadb with new installer option and password notice

Browse Source
This commit is contained in:
Adnan Abdulhussein
2015-06-02 14:16:08 -07:00
parent fef783248e
commit 508cdf8d67
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bitnami/mariadb/Dockerfile
View File

@@ -11,7 +11,10 @@ COPY post-install.sh /tmp/post-install.sh
# We need to specify a mysql password since the installer initializes the database, but it is
# removed in the post install and re-initialized at runtime.
RUN sh /tmp/install.sh\
--base_password bitnami --mysql_password bitnami --mysql_allow_all_remote_connections 1 --disable-components common
--base_password bitnami --mysql_password bitnami --mysql_allow_all_remote_connections 1 --disable-components common --mysql_init_data_dir 0
# Temporary, should be removed from installer
RUN rm -rf /usr/local/bitnami/mysql/data
ENV PATH /usr/local/bitnami/mysql/bin:$PATH
EXPOSE 3306

36
bitnami/mariadb/entrypoint.sh
View File

@@ -15,17 +15,16 @@ fi
if [ "$1" = 'mysqld.bin' ]; then
set -- "$@" --defaults-file=/usr/local/bitnami/mysql/my.cnf --log-error=/usr/local/bitnami/mysql/logs/mysqld.log --basedir=/usr/local/bitnami/mysql --datadir=/usr/local/bitnami/mysql/data --plugin-dir=/usr/local/bitnami/mysql/lib/plugin --user=mysql --socket=/usr/local/bitnami/mysql/tmp/mysql.sock "--lower-case-table-names=1" $EXTRA_OPTIONS
mkdir -p /usr/local/bitnami/mysql/tmp
chown -R mysql:mysql /usr/local/bitnami/mysql/tmp
if [ ! "$(ls -A /data)" ]; then
if [ -z "$MYSQL_PASSWORD" ]; then
MYSQL_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c12)
RANDOM_PASSW=1
fi
echo "#########################################################################"
echo "# #"
echo "# Setting MySQL root password to '${MYSQL_PASSWORD}' #"
echo "# #"
echo "#########################################################################"
echo ""
echo "Initializing MySQL database..."
echo ""
@@ -41,6 +40,31 @@ if [ "$1" = 'mysqld.bin' ]; then
fi
set -- "$@" --init-file=/tmp/init_mysql.sql
echo "#########################################################################"
echo "# #"
echo "# Credentials for mariadb: #"
echo "# username: root #"
echo "# password: $MYSQL_PASSWORD #"
echo "# #"
if [ $RANDOM_PASSW ]; then
echo "# The password was generated automatically, if you want to use #"
echo "# your own password please set the MYSQL_PASSWORD environment #"
echo "# variable when running the container. #"
echo "# #"
fi
echo "#########################################################################"
echo ""
else
echo "#########################################################################"
echo "# #"
echo "# Credentials for mariadb: #"
echo "# The MYSQL_PASSWORD was set on first boot. #"
echo "# If you want to regenerate the password recreate this container. #"
echo "# #"
echo "#########################################################################"
echo ""
fi
chown -R mysql:mysql /usr/local/bitnami/mysql/logs

3
bitnami/mariadb/post-install.sh
View File

@@ -3,9 +3,6 @@
INSTALL_DIR=$1
cd $INSTALL_DIR
# remove unneeded files
rm -rf data scripts/myscript.sh scripts/myscript-upgrade.sh
# set up logging to stdout
mkdir logs
ln -s /dev/stdout logs/mysqld.log