Fix mariadb /conf volume

This commit is contained in:
Adnan Abdulhussein
2015-05-20 16:25:23 -07:00
parent a5d0e18656
commit fea97ec90b
2 changed files with 11 additions and 8 deletions
+3 -3
View File
@@ -8,14 +8,14 @@ RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -qy wget
/opt/bitnami/mysql/scripts/ctl.sh stop mysql > /dev/null && \
echo "bin/mysql -S /opt/bitnami/mysql/tmp/mysql.sock -u root -p\$2 -e \"GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '\$2' WITH GRANT OPTION;\"" >> /opt/bitnami/mysql/scripts/myscript.sh && \
rm -rf /tmp/* /opt/bitnami/mysql/data /opt/bitnami/ctlscript.sh && \
mkdir /data && chown mysql:mysql /data && \
mkdir /config && chown mysql:mysql /config && \
ln -s /data /opt/bitnami/mysql/data && \
mv /opt/bitnami/mysql/my.cnf /opt/bitnami/mysql/my.cnf.default && \
ln -s /conf/my.cnf /opt/bitnami/mysql/my.cnf && \
DEBIAN_FRONTEND=noninteractive apt-get --purge autoremove -qy wget && apt-get clean && rm -rf /var/lib/apt && rm -rf /var/cache/apt/archives/*
ENV PATH /opt/bitnami/mysql/bin:$PATH
EXPOSE 3306
VOLUME ["/data", "/config"]
VOLUME ["/data", "/conf"]
COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
+8 -5
View File
@@ -10,11 +10,18 @@ fi
if [ "$1" = 'mysqld.bin' ]; then
set -- "$@" --defaults-file=/opt/bitnami/mysql/my.cnf --basedir=/opt/bitnami/mysql --datadir=/opt/bitnami/mysql/data --plugin-dir=/opt/bitnami/mysql/lib/plugin --user=mysql --socket=/opt/bitnami/mysql/tmp/mysql.sock$EXTRA_OPTIONS
if [ ! -f "/conf/my.cnf" ]; then
echo "Copying default configuration to /conf/my.cnf..."
echo ""
cp /opt/bitnami/mysql/my.cnf.default /conf/my.cnf
fi
if [ ! "$(ls -A /data)" ]; then
if [ -z "$MYSQL_PASSWORD" ]; then
MYSQL_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c12)
fi
echo "Initializing MySQL database..."
echo ""
echo "#########################################################################"
echo "# #"
@@ -23,14 +30,10 @@ if [ "$1" = 'mysqld.bin' ]; then
echo "#########################################################################"
echo ""
chown mysql:mysql /data
su mysql -c "sh /opt/bitnami/mysql/scripts/myscript.sh /opt/bitnami/mysql $MYSQL_PASSWORD"
/opt/bitnami/mysql/scripts/ctl.sh stop mysql > /dev/null
fi
if [ ! -f "/config/my.cnf" ]; then
mv /opt/bitnami/mysql/my.cnf /config/my.cnf
ln -s /config/my.cnf /opt/bitnami/mysql/my.cnf
fi
fi
exec "$@"