From 3996e4b942057ffcc900c395d5a7015eb1b027cb Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Tue, 2 Apr 2019 14:51:59 +0200 Subject: [PATCH 1/3] added description for new env variables import export --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8917fcf..bc62673 100644 --- a/README.md +++ b/README.md @@ -106,10 +106,11 @@ Passbolt docker image provides several environment variables to configure differ | PASSBOLT_GPG_SERVER_KEY_FINGERPRINT | GnuPG fingerprint | null | | PASSBOLT_GPG_SERVER_KEY_PUBLIC | Path to GnuPG public server key | /var/www/passbolt/config/gpg/serverkey.asc | | PASSBOLT_GPG_SERVER_KEY_PRIVATE | Path to GnuPG private server key | /var/www/passbolt/config/gpg/serverkey_private.asc | +| PASSBOLT_PLUGINS_EXPORT_ENABLED | Enable export plugin | true | +| PASSBOLT_PLUGINS_IMPORT_ENABLED | Enable import plugin | true | | PASSBOLT_REGISTRATION_PUBLIC | Defines if users can register | false | | PASSBOLT_SSL_FORCE | Redirects http to https | true | -| PASSBOLT_SECURITY_SET_HEADERS | Send CSP Headers | true | -| SECURITY_SALT | CakePHP security salt | __SALT__ | +| PASSBOLT_SECURITY_SET_HEADERS | Send CSP Headers | true | | SECURITY_SALT | CakePHP security salt | __SALT__ | For more env variables supported please check [default.php](https://github.com/passbolt/passbolt_api/blob/master/config/default.php) For more env variables supported please check [app.default.php](https://github.com/passbolt/passbolt_api/blob/master/config/app.default.php) From 95a8a3c7cc934a68830654dff8054c7a2f829cef Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Tue, 2 Apr 2019 17:21:03 +0200 Subject: [PATCH 2/3] updated changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a35028..0d6d369 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.8.1...HEAD) +## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.8.3...HEAD) + +## [2.8.2](https://github.com/passbolt/passbolt_docker/compare/v2.8.2...v2.8.3) - 2019-04-02 + +### Added + +- Documentation for PASSBOLT_PLUGINS_EXPORT_ENABLED and PASSBOLT_PLUGINS_IMPORT_ENABLED ## [2.8.2](https://github.com/passbolt/passbolt_docker/compare/v2.8.1...v2.8.2) - 2019-04-01 From a1faa6484f349d18cfd3ea8cbe6ec69dfafc5669 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Tue, 2 Apr 2019 17:21:24 +0200 Subject: [PATCH 3/3] version bump --- Dockerfile | 2 +- docker-compose-pro.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f28499f..b8e4e93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:7.2-fpm LABEL maintainer="diego@passbolt.com" -ARG PASSBOLT_VERSION="2.8.2" +ARG PASSBOLT_VERSION="2.8.3" ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz" ARG PHP_EXTENSIONS="gd \ diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml index 19383a9..5eadd6f 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.8.2-pro-debian + image: passbolt/passbolt:2.8.3-pro-debian tty: true depends_on: - db diff --git a/docker-compose.yml b/docker-compose.yml index 0dcd9dc..83b24a9 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.8.2-debian + image: passbolt/passbolt:2.8.3-debian tty: true depends_on: - db