commit edc0b802b48f11e04d5c3f2aeafc128d25723274
Author: Adnan Abdulhussein <adnan@bitnami.com>
Date:   Tue May 19 19:34:51 2015 -0700

    Add pineapple and mariadb

diff --git a/bitnami/mariadb/Dockerfile b/bitnami/mariadb/Dockerfile
new file mode 100644
index 000000000000..5739e4baf002
--- /dev/null
+++ b/bitnami/mariadb/Dockerfile
@@ -0,0 +1,21 @@
+FROM ubuntu-debootstrap:14.04
+
+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 && \
+    chmod +x /tmp/installer.run && \
+    /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 && \
+    mkdir /data && chown mysql:mysql /data && \
+    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"]
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD ["mysqld.bin"]
diff --git a/bitnami/mariadb/Dockerfile.pa b/bitnami/mariadb/Dockerfile.pa
new file mode 100644
index 000000000000..a88cb92f7412
--- /dev/null
+++ b/bitnami/mariadb/Dockerfile.pa
@@ -0,0 +1,8 @@
+FROM bitnami/pineapple
+
+RUN apk add --update wget && \
+    wget --no-check-certificate https://downloads.bitnami.com/files/download/mariadb/bitnami-mariadb-5.5.42-0-linux-x64-installer.run -O /tmp/installer.run && \
+    chmod +x /tmp/installer.run && \
+    /tmp/installer.run --mode unattended --base_password bitnami --mysql_password bitnami --prefix /opt/bitnami && \
+    rm -rf /tmp/* /opt/bitnami/common /opt/bitnami/mysql/data && \
+    apk del wget
diff --git a/bitnami/mariadb/entrypoint.sh b/bitnami/mariadb/entrypoint.sh
new file mode 100755
index 000000000000..bda1782275c8
--- /dev/null
+++ b/bitnami/mariadb/entrypoint.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# if command starts with an option, prepend mysqld
+if [ "${1:0:1}" = '-' ]; then
+  EXTRA_OPTIONS=" $@"
+  set -- mysqld.bin
+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 [ ! "$(ls -A /data)" ]; then
+    su mysql -c "sh /opt/bitnami/mysql/scripts/myscript.sh /opt/bitnami/mysql bitnami"
+    /opt/bitnami/mysql/scripts/ctl.sh stop mysql > /dev/null
+  fi
+fi
+
+exec "$@"