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

Refactoring + welcome page

Browse Source
This commit is contained in:
Miguel Martinez
2015-06-09 19:29:56 -07:00
parent 57844c5162
commit dd34eb16de
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bitnami/mariadb/Dockerfile
View File

@@ -2,10 +2,16 @@ FROM ubuntu-debootstrap:14.04
MAINTAINER Bitnami MAINTAINER Bitnami
ENV BITNAMI_PREFIX=/usr/local/bitnami ENV BITNAMI_PREFIX=/usr/local/bitnami
ENV BITNAMI_APP_NAME mariadb
ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/mysql ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/mysql
ENV BITNAMI_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME ENV BITNAMI_APP_NAME mariadb
ENV BITNAMI_APP_USER mysql
ENV BITNAMI_APP_VERSION 5.5.42-0 ENV BITNAMI_APP_VERSION 5.5.42-0
ENV BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME
# General Utility functions
ADD https://www.dropbox.com/s/kce54xvd1jmka3h/bitnami-utils.sh?dl=1 /bitnami-utils.sh
# Specific Utility functions
COPY bitnami-utils-custom.sh /bitnami-utils-custom.sh
ADD https://storage.googleapis.com/bitnami-artifacts/install.sh?GoogleAccessId=432889337695-e1gggo94k5qubupjsb35tajs91bdu0hg@developer.gserviceaccount.com&Expires=1434934078&Signature=QNkAu%2F8E2RlalSQy4n1sxMhsGKF%2FVltr6zu65HU6A9H0HKOgl6u9etqy9w6OwD4DsLMxYuy2uymOK3iDc5RbfkAMncKI1zJpxcwRQ4Mt43Oe8PBXKbQYcZ7mQaYPtpnjYblDs1S2p12Pu5NTDJHK2hJ1MrIUYwBup5n60R6OJRI%3D /tmp/install.sh ADD https://storage.googleapis.com/bitnami-artifacts/install.sh?GoogleAccessId=432889337695-e1gggo94k5qubupjsb35tajs91bdu0hg@developer.gserviceaccount.com&Expires=1434934078&Signature=QNkAu%2F8E2RlalSQy4n1sxMhsGKF%2FVltr6zu65HU6A9H0HKOgl6u9etqy9w6OwD4DsLMxYuy2uymOK3iDc5RbfkAMncKI1zJpxcwRQ4Mt43Oe8PBXKbQYcZ7mQaYPtpnjYblDs1S2p12Pu5NTDJHK2hJ1MrIUYwBup5n60R6OJRI%3D /tmp/install.sh
COPY post-install.sh /tmp/post-install.sh COPY post-install.sh /tmp/post-install.sh
@@ -20,13 +26,9 @@ RUN rm -rf $BITNAMI_APP_DIR/data
ENV PATH $BITNAMI_APP_DIR/bin:$PATH ENV PATH $BITNAMI_APP_DIR/bin:$PATH
EXPOSE 3306 EXPOSE 3306
VOLUME ["$BITNAMI_VOL_PREFIX/data", "$BITNAMI_VOL_PREFIX/conf", "$BITNAMI_VOL_PREFIX/logs"] VOLUME ["$BITNAMI_APP_VOL_PREFIX/data", "$BITNAMI_APP_VOL_PREFIX/conf", "$BITNAMI_APP_VOL_PREFIX/logs"]
COPY entrypoint.sh /entrypoint.sh COPY entrypoint.sh /entrypoint.sh
# General Utility functions
ADD https://www.dropbox.com/s/kce54xvd1jmka3h/bitnami-utils.sh?dl=1 /bitnami-utils.sh
# Specific Utility functions
COPY bitnami-utils-custom.sh /bitnami-utils-custom.sh
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]
CMD ["mysqld.bin"] CMD ["mysqld.bin"]

4
bitnami/mariadb/bitnami-utils-custom.sh
View File

@@ -1,11 +1,11 @@
# MariaDB Utility functions # MariaDB Utility functions
PROGRAM_OPTIONS="--defaults-file=$BITNAMI_APP_DIR/my.cnf --log-error=$BITNAMI_APP_DIR/logs/mysqld.log --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data --plugin-dir=$BITNAMI_APP_DIR/lib/plugin --user=$SERVICE_USER --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --lower-case-table-names=1 $EXTRA_OPTIONS" PROGRAM_OPTIONS="--defaults-file=$BITNAMI_APP_DIR/my.cnf --log-error=$BITNAMI_APP_DIR/logs/mysqld.log --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data --plugin-dir=$BITNAMI_APP_DIR/lib/plugin --user=$BITNAMI_APP_USER --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --lower-case-table-names=1 $EXTRA_OPTIONS"
initialize_database() { initialize_database() {
echo "==> Initializing MySQL database..." echo "==> Initializing MySQL database..."
echo "" echo ""
$BITNAMI_APP_DIR/scripts/mysql_install_db --port=3306 --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data > /dev/null $BITNAMI_APP_DIR/scripts/mysql_install_db --port=3306 --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data > /dev/null
chown -R $SERVICE_USER:$SERVICE_USER $BITNAMI_APP_DIR/data chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/data
} }
create_custom_database() { create_custom_database() {

11
bitnami/mariadb/entrypoint.sh
View File

@@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
set -e set -e
source /bitnami-utils.sh source /bitnami-utils.sh
SERVICE_USER=mysql
print_welcome_page
# if command starts with an option, prepend mysqld # if command starts with an option, prepend mysqld
if [ "${1:0:1}" = '-' ]; then if [ "${1:0:1}" = '-' ]; then
@@ -9,16 +10,16 @@ if [ "${1:0:1}" = '-' ]; then
set -- mysqld.bin set -- mysqld.bin
fi fi
if [ ! "$(ls -A $BITNAMI_VOL_PREFIX/conf)" ]; then if [ ! "$(ls -A $BITNAMI_APP_VOL_PREFIX/conf)" ]; then
generate_conf_files generate_conf_files
fi fi
if [ "$1" = 'mysqld.bin' ]; then if [ "$1" = 'mysqld.bin' ]; then
set -- $@ $PROGRAM_OPTIONS set -- $@ $PROGRAM_OPTIONS
mkdir -p $BITNAMI_APP_DIR/tmp mkdir -p $BITNAMI_APP_DIR/tmp
chown -R $SERVICE_USER:$SERVICE_USER $BITNAMI_APP_DIR/tmp chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/tmp
if [ ! "$(ls -A $BITNAMI_VOL_PREFIX/data)" ]; then if [ ! "$(ls -A $BITNAMI_APP_VOL_PREFIX/data)" ]; then
set -- "$@" --init-file=/tmp/init_mysql.sql set -- "$@" --init-file=/tmp/init_mysql.sql
@@ -33,7 +34,7 @@ if [ "$1" = 'mysqld.bin' ]; then
print_container_already_initialized $BITNAMI_APP_NAME print_container_already_initialized $BITNAMI_APP_NAME
fi fi
chown -R $SERVICE_USER:$SERVICE_USER $BITNAMI_APP_DIR/logs chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/logs
fi fi
exec "$@" exec "$@"

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

@@ -13,6 +13,6 @@ mv my.cnf conf.defaults/
ln -s $INSTALL_DIR/conf/my.cnf my.cnf ln -s $INSTALL_DIR/conf/my.cnf my.cnf
# symlink mount points at root to install dir # symlink mount points at root to install dir
ln -s $INSTALL_DIR/conf $BITNAMI_VOL_PREFIX/conf ln -s $INSTALL_DIR/conf $BITNAMI_APP_VOL_PREFIX/conf
ln -s $INSTALL_DIR/data $BITNAMI_VOL_PREFIX/data ln -s $INSTALL_DIR/data $BITNAMI_APP_VOL_PREFIX/data
ln -s $INSTALL_DIR/logs $BITNAMI_VOL_PREFIX/logs ln -s $INSTALL_DIR/logs $BITNAMI_APP_VOL_PREFIX/logs