From 1277a60bdb2b040acb48c7676862783b41d967bc Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 22 Sep 2016 15:58:03 +0000 Subject: [PATCH] New version release of MariaDB --- bitnami/mariadb/Dockerfile | 4 ++-- bitnami/mariadb/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/mariadb/Dockerfile b/bitnami/mariadb/Dockerfile index 9a3306ebfb18..30b9e0093b44 100644 --- a/bitnami/mariadb/Dockerfile +++ b/bitnami/mariadb/Dockerfile @@ -16,11 +16,11 @@ ENV STACKSMITH_STACK_ID="3ziu7db" \ ## STACKSMITH-END: Modifications below this line will be unchanged when regenerating -ENV BITNAMI_IMAGE_VERSION=10.1.14-r6 \ +ENV BITNAMI_IMAGE_VERSION=10.1.17-r0 \ BITNAMI_APP_NAME=mariadb \ BITNAMI_APP_USER=mysql -RUN bitnami-pkg unpack mariadb-10.1.14-6 --checksum 47a855094b67fe251a5f3637b6b10f0e3b213efa09157c08de36569b7f2b5ffe +RUN bitnami-pkg unpack mariadb-10.1.17-0 --checksum b1579fbdf3aff7116ffe1703aa704fa5cb2eebd292c2516a80c9e237e3074af8 ENV PATH=/opt/bitnami/$BITNAMI_APP_NAME/sbin:/opt/bitnami/$BITNAMI_APP_NAME/bin:$PATH COPY rootfs/ / diff --git a/bitnami/mariadb/README.md b/bitnami/mariadb/README.md index bf4fd329776e..db0d631f3ecf 100644 --- a/bitnami/mariadb/README.md +++ b/bitnami/mariadb/README.md @@ -286,7 +286,7 @@ The above command scales up the number of slaves to `3`. You can scale down in t ## Configuration file -The image looks for configuration in the `conf/` directory of `/bitnami/mariadb`, and also in the `extra/` directory of the same folder for extra configuration files.. If you want to overwrite the default my.cnf configuration files with one of your creation, you should mount a volume at `/bitnami/mariadb/extra` and add any `.cnf` file with directives you want to include in your `my.cnf` file. +The image looks for configuration in the `conf/` directory of `/bitnami/mariadb`. As as mentioned in [Persisting your database](#persisting-your-data) you can mount a volume at this location and copy your own configuration file in the `conf/` directory as my-custom.cnf. That file will be included in the main configuration file and will overwrite any configuration you want to modify. ### Step 1: Run the MariaDB image