Bitnami/containers
2
0
Fork 0
mirror of https://github.com/bitnami/containers.git synced 2026-03-20 14:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

switch to harpoon installer

Browse Source
This commit is contained in:
Sameer Naik
2016-02-16 12:02:43 -08:00
parent 5dadafae35
commit 1453ebc8ac
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bitnami/mariadb/Dockerfile
View File

@@ -1,17 +1,21 @@
FROM bitnami/base-ubuntu:14.04-onbuild
MAINTAINER Bitnami <containers@bitnami.com>
ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/mysql \
BITNAMI_APP_NAME=mariadb \
ENV BITNAMI_APP_NAME=mariadb \
BITNAMI_APP_USER=mysql \
BITNAMI_APP_DAEMON=mysqld.bin \
BITNAMI_APP_VERSION=5.5.46-0-r01
BITNAMI_APP_DAEMON=mysqld \
BITNAMI_APP_VERSION=10.1.11-0 \
BITNAMI_APP_OPTIONS="--password bitnami" \
MARIADB_PACKAGE_SHA256="59cb45e66e7b9b3697296cca8ad8c988ddc089016fef94b7133587cb838c8505"
ENV BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME \
PATH=$BITNAMI_APP_DIR/bin:$PATH
ENV BITNAMI_APP_DIR=$BITNAMI_PREFIX/$BITNAMI_APP_NAME \
BITNAMI_APP_VOL_PREFIX=/bitnami/$BITNAMI_APP_NAME
RUN $BITNAMI_PREFIX/install.sh\
--base_password bitnami --mysql_password bitnami --mysql_allow_all_remote_connections 1 --disable-components common --mysql_init_data_dir 0
ENV PATH=$BITNAMI_APP_DIR/sbin:$BITNAMI_APP_DIR/bin:$PATH
COPY pkg-cache/ $BITNAMI_PKG_CACHE/
RUN $BITNAMI_PREFIX/install.sh
COPY rootfs/ /

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

@@ -1,18 +1,19 @@
#!/bin/bash
cd $BITNAMI_APP_DIR
# disable DNS lookups
(
echo "[mysqld]"
echo "skip-name-resolve"
) >> $BITNAMI_APP_DIR/conf/my.cnf
# set up default config
mkdir conf.defaults
mv my.cnf conf.defaults/
ln -s $BITNAMI_APP_DIR/conf/my.cnf my.cnf
mv $BITNAMI_APP_DIR/conf $BITNAMI_APP_DIR/conf.defaults
# remove existing default data and logs
rm -rf $BITNAMI_APP_DIR/data
rm -rf $BITNAMI_APP_DIR/logs
# symlink mount points at root to install dir
ln -s $BITNAMI_APP_DIR/conf $BITNAMI_APP_VOL_PREFIX/conf
ln -s $BITNAMI_APP_DIR/data $BITNAMI_APP_VOL_PREFIX/data
ln -s $BITNAMI_APP_DIR/logs $BITNAMI_APP_VOL_PREFIX/logs
# disable DNS lookups
cat >> $BITNAMI_APP_DIR/conf.defaults/my.cnf <<EOF
[mysqld]
skip-name-resolve
EOF

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

@@ -1,5 +1,5 @@
# 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=$BITNAMI_APP_USER --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --lower-case-table-names=1"
PROGRAM_OPTIONS="--defaults-file=$BITNAMI_APP_DIR/conf/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"
case "$MARIADB_REPLICATION_MODE" in
master )
@@ -13,7 +13,7 @@ esac
initialize_database() {
echo "==> Initializing MySQL database..."
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
mysql_install_db --port=3306 --socket=$BITNAMI_APP_DIR/tmp/mysql.sock --basedir=$BITNAMI_APP_DIR --datadir=$BITNAMI_APP_DIR/data > /dev/null 2>&1
chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/data
}

2
bitnami/mariadb/test.sh
View File

@@ -8,7 +8,7 @@ MARIADB_REPLICATION_PASSWORD=repl_password
# source the helper script
APP_NAME=mariadb
SLEEP_TIME=5
SLEEP_TIME=10
load tests/docker_helper
# Link to container and execute mysql client