Merge branch 'release/v2.0.4'

CHANGELOG.md

@@ -2,7 +2,19 @@
 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.3...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.0.4...HEAD)
+
+## [2.0.4](https://github.com/passbolt/passbolt_docker/compare/v2.0.2...v2.0.4) - 2018-04-26
+
+### Fixed
+
+- Authentication plugin 'caching_sha2_password' cannot be loaded [#103](https://github.com/passbolt/passbolt_docker/issues/103)
+
+### Changed
+
+- MariaDB as default SQL backend option in docker-compose files related with [#103](https://github.com/passbolt/passbolt_docker/issues/103)
+- Replace php copy with curl for use with proxy [#102](https://github.com/passbolt/passbolt_docker/pull/102)
+- Documentation requirements moved up in the README
 
 ## [2.0.3](https://github.com/passbolt/passbolt_docker/compare/v2.0.2...v2.0.3) - 2018-04-20
 

Dockerfile

@@ -2,7 +2,7 @@ FROM php:7-fpm
 
 LABEL maintainer="diego@passbolt.com"
 
-ARG PASSBOLT_VERSION="2.0.3"
+ARG PASSBOLT_VERSION="2.0.4"
 ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz"
 
 ARG PHP_EXTENSIONS="gd \
@@ -56,7 +56,7 @@ RUN apt-get update \
     && docker-php-ext-enable $PHP_EXTENSIONS $PECL_PASSBOLT_EXTENSIONS \
     && docker-php-source delete \
     && EXPECTED_SIGNATURE=$(curl -s https://composer.github.io/installer.sig) \
-    && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && curl -o composer-setup.php https://getcomposer.org/installer \
     && ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');") \
     && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then \
          >&2 echo 'ERROR: Invalid installer signature'; \

README.md

@@ -20,6 +20,12 @@
 Passbolt is a free and open source password manager that allows team members to
 store and share credentials securely.
 
+# Requirements:
+
+* rng-tools or haveged are required on host machine to speed up entropy generation on containers.
+This way gpg key creation on passbolt container will be faster.
+* mariadb/mysql >= 5.0
+
 # Usage
 
 Users are encouraged to use [official docker image from the docker hub](https://hub.docker.com/r/passbolt/passbolt/).

docker-compose-dev.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   db:
-    image: mysql:latest
+    image: mariadb:latest
     env_file:
       - env/mysql.env
     volumes:

docker-compose-pro.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   db:
-    image: mysql:latest
+    image: mariadb:latest
     env_file:
       - env/mysql.env
     volumes:
@@ -10,7 +10,7 @@ services:
       - 3306
 
   passbolt:
-    image: passbolt/passbolt:2.0.3-pro-debian
+    image: passbolt/passbolt:2.0.4-pro-debian
     tty: true
     depends_on:
       - db

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   db:
-    image: mysql:latest
+    image: mariadb:latest
     env_file:
       - env/mysql.env
     volumes:
@@ -10,7 +10,7 @@ services:
       - 3306
 
   passbolt:
-    image: passbolt/passbolt:2.0.3-debian
+    image: passbolt/passbolt:2.0.4-debian
     tty: true
     depends_on:
       - db

spec/docker_runtime/runtime_spec.rb

@@ -16,7 +16,7 @@ describe 'passbolt_api service' do
           "mysqladmin ping --silent"
         ]
       },
-      'Image' => 'mysql')
+      'Image' => 'mariadb')
     @mysql.start
 
     while @mysql.json['State']['Health']['Status'] != 'healthy'