Merge branch 'release/v2.4.0'

passbolt · Oct 15, 2018 · 9fb0c5b · 9fb0c5b
2 parents 2e5a29b + 9f47007
commit 9fb0c5b
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,17 @@
 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.3.0...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.4.0...HEAD)
+
+## [2.4.0](https://github.com/passbolt/passbolt_docker/compare/v2.3.0...v2.4.0) - 2018-10-15
+
+### Added
+
+- Merged: Adding SSL configuration for mysql/mariadb [#111](https://github.com/passbolt/passbolt_docker/pull/111)
+
+### Fixed
+
+- Minor fix: Remove duplicate arg PHP_EXTENSIONS from Dockerfile
 
 ## [2.3.0](https://github.com/passbolt/passbolt_docker/compare/v2.2.0...v2.3.0) - 2018-09-03
 

diff --git a/Dockerfile b/Dockerfile
@@ -2,15 +2,9 @@ FROM php:7-fpm
 
 LABEL maintainer="[email protected]"
 
-ARG PASSBOLT_VERSION="2.3.0"
+ARG PASSBOLT_VERSION="2.4"
 ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz"
 
-ARG PHP_EXTENSIONS="gd \
-      intl \
-      pdo_mysql \
-      xsl"
-
-
 ARG PHP_EXTENSIONS="gd \
       intl \
       pdo_mysql \

diff --git a/README.md b/README.md
@@ -80,6 +80,9 @@ Passbolt docker image provides several environment variables to configure differ
 | DATASOURCES_DEFAULT_USERNAME        | Database username                | '' |
 | DATASOURCES_DEFAULT_PASSWORD        | Database password                | '' |
 | DATASOURCES_DEFAULT_DATABASE        | Database name                    | '' |
+| DATASOURCES_DEFAULT_SSL_KEY         | Database SSL Key                 | '' |
+| DATASOURCES_DEFAULT_SSL_CERT        | Database SSL Cert                | '' |
+| DATASOURCES_DEFAULT_SSL_CA          | Database SSL CA                  | '' |
 | EMAIL_TRANSPORT_DEFAULT_CLASS_NAME  | Email classname                  | Smtp |
 | EMAIL_DEFAULT_FROM                  | From email address               | you@localhost |
 | EMAIL_DEFAULT_TRANSPORT             | Sets transport method            | default |
@@ -126,6 +129,20 @@ It is also possible to mount a ssl certificate on the following paths:
 * /etc/ssl/certs/certificate.crt
 * /etc/ssl/certs/certificate.key
 
+### Database SSL certificate files
+
+If Database SSL certs provided, you must mount mysql/mariadb specific conf on the following paths:
+* /etc/mysql/conf.d # if using mysql
+* /etc/mysql/mariadb.conf.d/ #if using mariadb
+
+Example:
+```
+[client]
+ssl-ca=/etc/mysql/ssl/ca-cert.pem
+ssl-cert=/etc/mysql/ssl/server-cert.pem
+ssl-key=/etc/mysql/ssl/server-key.pem
+```
+
 ### docker-compose
 
 Usage:

diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml
@@ -10,7 +10,7 @@ services:
       - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:2.3.0-pro-debian
+    image: passbolt/passbolt:2.4.0-pro-debian
     tty: true
     depends_on:
       - db

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:2.3.0-debian
+    image: passbolt/passbolt:2.4.0-debian
     tty: true
     depends_on:
       - db