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

Changes to mariadb container, support /conf volume

Browse Source
This commit is contained in:
Adnan Abdulhussein
2015-05-19 22:07:02 -07:00
parent edc0b802b4
commit 3ff8cc29b6
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/mariadb/Dockerfile
+4 -2
View File
@@ -1,4 +1,5 @@
FROM ubuntu-debootstrap:14.04
MAINTAINER Bitnami
RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -qy wget && \
wget -q --no-check-certificate https://downloads.bitnami.com/files/download/mariadb/bitnami-mariadb-5.5.42-0-linux-x64-installer.run -O /tmp/installer.run && \
@@ -6,14 +7,15 @@ RUN apt-get update -q && DEBIAN_FRONTEND=noninteractive apt-get install -qy wget
/tmp/installer.run --mode unattended --base_password bitnami --mysql_password bitnami --mysql_allow_all_remote_connections 1 --prefix /opt/bitnami --disable-components common && \
/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/common /opt/bitnami/mysql/data /opt/bitnami/ctlscript.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 && \
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"]
VOLUME ["/data", "/config"]
COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]
bitnami/mariadb/entrypoint.sh
+18 -1
View File
@@ -11,9 +11,26 @@ 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 [ ! "$(ls -A /data)" ]; then
su mysql -c "sh /opt/bitnami/mysql/scripts/myscript.sh /opt/bitnami/mysql bitnami"
if [ -z "$MYSQL_PASSWORD" ]; then
MYSQL_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c12)
fi
echo ""
echo "#########################################################################"
echo "# #"
echo "# Setting MySQL root password to '${MYSQL_PASSWORD}' #"
echo "# #"
echo "#########################################################################"
echo ""
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 "$@"