From 72e8e244998b0388387499bc6c6b94da164dda1e Mon Sep 17 00:00:00 2001 From: bappr Date: Sat, 4 Aug 2018 10:50:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=A8=20Adding=20SSL=20configuration=20?= =?UTF-8?q?for=20mysql/mariadb=20-=20passbolt=5Fapi/pull/275?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index c235b8d..15641fa 100644 --- 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_SSL_KEY | Database SSL Key | '' | +| DATASOURCES_SSL_CERT | Database SSL Cert | '' | +| DATASOURCES_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: From 9321579efd224052c82a696bd48a34b07dee39c1 Mon Sep 17 00:00:00 2001 From: bappr Date: Tue, 7 Aug 2018 19:16:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=9A=A7=20=20Follow=20passbolt=20confi?= =?UTF-8?q?g=20files=20convention?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 15641fa..85b47bd 100644 --- a/README.md +++ b/README.md @@ -80,9 +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_SSL_KEY | Database SSL Key | '' | -| DATASOURCES_SSL_CERT | Database SSL Cert | '' | -| DATASOURCES_SSL_CA | Database SSL CA | '' | +| 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 | From 5359ec4cedeb1ee1611e8ba4628b7d9f1dae1264 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 15 Oct 2018 09:00:03 +0200 Subject: [PATCH 3/5] removed duplicate ARG PHP_EXTENSIONS --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1438316..2115fe6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,9 @@ FROM php:7-fpm LABEL maintainer="diego@passbolt.com" -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 \ From 2448491d46f419c703efb28193891979b778cf9d Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 15 Oct 2018 09:00:52 +0200 Subject: [PATCH 4/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 51ce15a..b2f909e 100644 --- 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 index 0e67fc8..f473a39 100644 --- 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 From 9f47007b0794fa27bc6c104f4cd0b957477f3779 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 15 Oct 2018 09:19:58 +0200 Subject: [PATCH 5/5] updated changelog for 2.4.0 --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ace883..08be30c 100644 --- 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