From 6fa055d37aa0dab8dd7ab5cc8eed864572684cdb Mon Sep 17 00:00:00 2001
From: Tomas Pizarro <tomas@bitnami.com>
Date: Thu, 2 Mar 2017 12:00:27 +0000
Subject: [PATCH 1/2] Set ALLOW_EMPTY_PASSWORD env var for mariadb image

---
 bitnami/jasperreports/6/docker-compose.yml | 2 ++
 bitnami/jasperreports/README.md            | 8 ++++++--
 bitnami/jasperreports/docker-compose.yml   | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bitnami/jasperreports/6/docker-compose.yml b/bitnami/jasperreports/6/docker-compose.yml
index 4ca524e1e0e5..347ac2c0daf5 100644
--- a/bitnami/jasperreports/6/docker-compose.yml
+++ b/bitnami/jasperreports/6/docker-compose.yml
@@ -2,6 +2,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   jasperreports:
diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md
index 7a1e881a6694..5755cf9895dc 100644
--- a/bitnami/jasperreports/README.md
+++ b/bitnami/jasperreports/README.md
@@ -29,7 +29,11 @@ version: '2'
 
 services:
   mariadb:
-    image: bitnami/mariadb:latest
+    image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - mariadb_data:/bitnami/mariadb
   jasperreports:
@@ -117,7 +121,7 @@ In this case you need to specify the directories to mount on the run command. Th
 2. Create a MariaDB container with host volume:
 
   ```bash
-  $ docker run -d --name mariadb \
+  $ docker run -d --name mariadb -e ALLOW_EMPTY_PASSWORD=yes \
     --net jasperreports-tier \
     --volume /path/to/mariadb-persistence:/bitnami/mariadb \
    bitnami/mariadb:latest
diff --git a/bitnami/jasperreports/docker-compose.yml b/bitnami/jasperreports/docker-compose.yml
index cc6424dd349b..bae19b37eb6d 100644
--- a/bitnami/jasperreports/docker-compose.yml
+++ b/bitnami/jasperreports/docker-compose.yml
@@ -2,6 +2,8 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
+    environment:
+      - ALLOW_EMPTY_PASSWORD=yes
     volumes:
       - 'mariadb_data:/bitnami/mariadb'
   jasperreports:

From 2ddff52e8dbb330207af68349718a230089ce461 Mon Sep 17 00:00:00 2001
From: tompizmor <tompizmor@users.noreply.github.com>
Date: Thu, 2 Mar 2017 13:11:57 +0100
Subject: [PATCH 2/2] Remove duplicated line

---
 bitnami/jasperreports/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bitnami/jasperreports/README.md b/bitnami/jasperreports/README.md
index 5755cf9895dc..ddf5d213ba15 100644
--- a/bitnami/jasperreports/README.md
+++ b/bitnami/jasperreports/README.md
@@ -30,8 +30,6 @@ version: '2'
 services:
   mariadb:
     image: 'bitnami/mariadb:latest'
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
     environment:
       - ALLOW_EMPTY_PASSWORD=yes
     volumes: