From 83db1d7fb09d08903c0fdb1f2a2c735085fdf30c Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Thu, 14 Jun 2018 17:33:46 +0200
Subject: [PATCH 1/5] use declare instead of printenv for safe env var export.
 Fixes #105

---
 bin/docker-entrypoint.sh            | 3 +--
 spec/docker_runtime/runtime_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index 01a602e..c4bc6bb 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -71,9 +71,8 @@ install() {
 }
 
 email_cron_job() {
-  printenv > /etc/environment
-  sed -i 's/=\(.*\)/="\1"/g' /etc/environment
   cron_task='/etc/cron.d/passbolt_email'
+  declare -p | grep -Ev 'BASHOPTS|BASH_VERSINFO|EUID|PPID|SHELLOPTS|UID' > /etc/environment
   if [ ! -f "$cron_task" ]; then
     echo "* * * * * su -c \"source /etc/environment ; /var/www/passbolt/bin/cake EmailQueue.sender\" -s /bin/bash www-data >> /var/log/cron.log 2>&1" >> $cron_task
     crontab /etc/cron.d/passbolt_email
diff --git a/spec/docker_runtime/runtime_spec.rb b/spec/docker_runtime/runtime_spec.rb
index 280c429..2b6d10a 100644
--- a/spec/docker_runtime/runtime_spec.rb
+++ b/spec/docker_runtime/runtime_spec.rb
@@ -9,7 +9,7 @@ describe 'passbolt_api service' do
         'MYSQL_ROOT_PASSWORD=test',
         'MYSQL_DATABASE=passbolt',
         'MYSQL_USER=passbolt',
-        'MYSQL_PASSWORD=P4ssb0lt'
+        'MYSQL_PASSWORD=±!@#$%^&*()_+=-}{|:;<>?'
       ],
       "Healthcheck" => {
         "Test": [
@@ -28,7 +28,7 @@ describe 'passbolt_api service' do
     @container = Docker::Container.create(
       'Env' => [
         "DATASOURCES_DEFAULT_HOST=#{@mysql.json['NetworkSettings']['IPAddress']}",
-        'DATASOURCES_DEFAULT_PASSWORD=P4ssb0lt',
+        'DATASOURCES_DEFAULT_PASSWORD=±!@#$%^&*()_+=-}{|:;<>?',
         'DATASOURCES_DEFAULT_USERNAME=passbolt',
         'DATASOURCES_DEFAULT_DATABASE=passbolt',
         'PASSBOLT_SSL_FORCE=true'

From 048a2b4a85156f36067b148101f0da9169274d28 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Thu, 14 Jun 2018 17:33:54 +0200
Subject: [PATCH 2/5] version bump

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f718a35..76f9df4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM php:7-fpm
 
 LABEL maintainer="diego@passbolt.com"
 
-ARG PASSBOLT_VERSION="2.0.7"
+ARG PASSBOLT_VERSION="2.1.0"
 ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz"
 
 ARG PHP_EXTENSIONS="gd \

From 9cf442b1db099db1fa8a4b2dc996c17e6fa8c89c Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Thu, 14 Jun 2018 17:41:37 +0200
Subject: [PATCH 3/5] updated changelog 2.1.0

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fe0d8b..49caa20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.0.7...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.1.0...HEAD)
+
+## [2.1.0](https://github.com/passbolt/passbolt_docker/compare/v2.0.7...v2.1.0) - 2018-06-14
+
+### Fixed
+
+- cron EmailQueue.sender job fails if db password contains certain characters [#105](https://github.com/passbolt/passbolt_docker/issues/105)
 
 ## [2.0.7](https://github.com/passbolt/passbolt_docker/compare/v2.0.5...v2.0.7) - 2018-05-09
 

From 9eed847ce204e3e45f0e58dbbedbeae9e713a76e Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Thu, 14 Jun 2018 18:14:18 +0200
Subject: [PATCH 4/5] removed force flag from install task

---
 bin/docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh
index c4bc6bb..51ec676 100755
--- a/bin/docker-entrypoint.sh
+++ b/bin/docker-entrypoint.sh
@@ -63,7 +63,7 @@ install() {
   fi
 
   if [ "$tables" -eq 0 ]; then
-    su -c '/var/www/passbolt/bin/cake passbolt install --no-admin --force' -s /bin/bash www-data
+    su -c '/var/www/passbolt/bin/cake passbolt install --no-admin' -s /bin/bash www-data
   else
     su -c '/var/www/passbolt/bin/cake passbolt migrate' -s /bin/bash www-data
     echo "Enjoy! ☮"

From 6bced596ef17ac98fe3978e751edd2817a14f577 Mon Sep 17 00:00:00 2001
From: Diego Lendoiro <diego@passbolt.com>
Date: Thu, 14 Jun 2018 18:14:31 +0200
Subject: [PATCH 5/5] version bump

---
 docker-compose-pro.yml | 2 +-
 docker-compose.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml
index 23291ec..2666bdf 100644
--- a/docker-compose-pro.yml
+++ b/docker-compose-pro.yml
@@ -10,7 +10,7 @@ services:
       - 3306
 
   passbolt:
-    image: passbolt/passbolt:2.0.7-pro-debian
+    image: passbolt/passbolt:2.1.1-pro-debian
     tty: true
     depends_on:
       - db
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b4da84..2b06a8e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - 3306
 
   passbolt:
-    image: passbolt/passbolt:2.0.7-debian
+    image: passbolt/passbolt:2.1.0-debian
     tty: true
     depends_on:
       - db