From 79a02e1ba953edda5a23410a9173dde6ca7cb81a Mon Sep 17 00:00:00 2001 From: Adnan Abdulhussein Date: Fri, 19 Jun 2015 10:43:46 -0700 Subject: [PATCH 1/2] Always chown mounted volumes at the start --- bitnami/mariadb/entrypoint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bitnami/mariadb/entrypoint.sh b/bitnami/mariadb/entrypoint.sh index 446a2c026d4b..505bee8ebb35 100755 --- a/bitnami/mariadb/entrypoint.sh +++ b/bitnami/mariadb/entrypoint.sh @@ -34,7 +34,10 @@ if [ "$1" = 'mysqld.bin' ]; then print_container_already_initialized $BITNAMI_APP_NAME fi - chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER $BITNAMI_APP_DIR/logs || true + chown -R $BITNAMI_APP_USER:$BITNAMI_APP_USER \ + $BITNAMI_APP_VOL_PREFIX/conf/ \ + $BITNAMI_APP_VOL_PREFIX/logs/ \ + $BITNAMI_APP_VOL_PREFIX/data/ || true fi exec "$@" From 6e82997a6e9e267a38ef8c022a93cdfd43a244e8 Mon Sep 17 00:00:00 2001 From: Adnan Abdulhussein Date: Fri, 19 Jun 2015 10:46:24 -0700 Subject: [PATCH 2/2] Fix tests to not rely on docker client running directly on the host --- bitnami/mariadb/test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bitnami/mariadb/test.sh b/bitnami/mariadb/test.sh index a6e55b6b5bfe..ea07f96d9549 100644 --- a/bitnami/mariadb/test.sh +++ b/bitnami/mariadb/test.sh @@ -98,7 +98,7 @@ create_full_container_mounted(){ # Can not login as root run mysql_client -e 'show databases\G' [ $status = 1 ] - run mysql_client -u $MARIADB_USER -e 'show databases\G' + run mysql_client -u $MARIADB_USER -e 'show databases\G' [[ "$output" =~ "Database: $MARIADB_DATABASE" ]] } @@ -160,7 +160,7 @@ create_full_container_mounted(){ @test "Data gets generated in conf and data if bind mounted in the host" { create_full_container_mounted - run ls -l $HOST_VOL_PREFIX/conf/my.cnf $HOST_VOL_PREFIX/logs/mysqld.log + run docker run -v $HOST_VOL_PREFIX:$HOST_VOL_PREFIX --rm bitnami/mariadb ls -l $HOST_VOL_PREFIX/conf/my.cnf $HOST_VOL_PREFIX/logs/mysqld.log [ $status = 0 ] cleanup_volumes_content }