public_git/bitnami-containers
1
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-10-17 16:33:55 +02:00
Code Issues Projects Releases Wiki Activity

Use /conf.defaults similar to nginx

Browse Source
This commit is contained in:
Adnan Abdulhussein
2015-05-20 16:57:26 -07:00
parent fea97ec90b
commit 787b52b67b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/mariadb/Dockerfile
+5 -3
View File
@@ -8,9 +8,11 @@ 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 && \
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 && \
mkdir /opt/bitnami/mysql/conf.defaults && \
mv /opt/bitnami/mysql/my.cnf /opt/bitnami/mysql/conf.defaults/ && \
ln -s /opt/bitnami/mysql/conf/my.cnf /opt/bitnami/mysql/my.cnf && \
ln -s /opt/bitnami/mysql/conf /conf && \
ln -s /opt/bitnami/mysql/data /data && \
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
bitnami/mariadb/entrypoint.sh
+2 -2
View File
@@ -10,10 +10,10 @@ 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
if [ ! "$(ls -A /conf)" ]; then
echo "Copying default configuration to /conf/my.cnf..."
echo ""
cp /opt/bitnami/mysql/my.cnf.default /conf/my.cnf
cp -r /opt/bitnami/mysql/conf.defaults/* /opt/bitnami/mysql/conf
fi
if [ ! "$(ls -A /data)" ]; then