Merge branch 'release/v2.1.0'

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
 

Dockerfile

@@ -2,7 +2,7 @@ FROM php:7-fpm
 
 LABEL maintainer="[email protected]"
 
-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 \

bin/docker-entrypoint.sh

@@ -63,17 +63,16 @@ 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! ☮"
   fi
 }
 
 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

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

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

spec/docker_runtime/runtime_spec.rb

@@ -9,7 +9,7 @@
         'MYSQL_ROOT_PASSWORD=test',
         'MYSQL_DATABASE=passbolt',
         'MYSQL_USER=passbolt',
-        'MYSQL_PASSWORD=P4ssb0lt'
+        'MYSQL_PASSWORD=±!@#$%^&*()_+=-}{|:;<>?'
       ],
       "Healthcheck" => {
         "Test": [
@@ -28,7 +28,7 @@
     @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'