From 31ebf7bf824efbe084183006fa0619c17a6273b6 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 31 Jul 2017 11:46:20 +0100 Subject: [PATCH 1/6] updated changelog for 1.6.1-1 --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b2e65d..e7d79f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v1.6.1...HEAD) -- Merged pull request PR[#20](https://github.com/passbolt/passbolt_docker/pull/20) Allow no db environment variable setting +## [1.6.1-1](https://github.com/passbolt/passbolt_docker/compare/v1.6.1...v1.6.1-1) - 2017-07-31 +## Added +- PASSBOLT-2276: ENV-Variable uppercase convention PR[#39](https://github.com/passbolt/passbolt_docker/pull/39) +- PASSBOLT-2159: Added registration env support PR[#37](https://github.com/passbolt/passbolt_docker/pull/37) +- PASSBOLT-2280: On MacOS systems note you should access it using https PR[#35](https://github.com/passbolt/passbolt_docker/pull/35) +- PASSBOLT-2279: Allow Config files to be symbolic links PR[#32](https://github.com/passbolt/passbolt_docker/pull/32) +- PASSBOLT-2278: Allow no db environment variable setting PR[#20](https://github.com/passbolt/passbolt_docker/pull/20) ## [1.6.1](https://github.com/passbolt/passbolt_docker/compare/v1.6.0...v1.6.1) - 2017-06-29 ### Fixed From 746c28c84f25eca2f1bb7cb6b40f2cd384f5c570 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 31 Jul 2017 11:51:39 +0100 Subject: [PATCH 2/6] better defaults for dummy domain example.com -> passbolt.local --- README.md | 2 +- bin/docker-entrypoint.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index eddc4d2..96507f7 100644 --- a/README.md +++ b/README.md @@ -74,7 +74,7 @@ Passbolt docker image provides several environment variables to configure differ * SALT: a random string used by cakephp in security hashing methods * CIPHERSEED: a random string used by cakephp to encrypt/decrypt strings -* URL: URL of the passbolt installation (defaults to example.com) +* URL: URL of the passbolt installation (defaults to passbolt.local) ### Database variables diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh index 3f817a9..540d120 100755 --- a/bin/docker-entrypoint.sh +++ b/bin/docker-entrypoint.sh @@ -45,7 +45,7 @@ core_setup() { local default_salt='DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi' local default_seed='76859309657453542496749683645' - local default_url='example.com' + local default_url='passbolt.local' cp $core_config{.default,} sed -i s:$default_salt:${SALT:-$default_salt}:g $core_config @@ -131,7 +131,7 @@ email_setup() { gen_ssl_cert() { openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 \ - -subj "/C=FR/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" \ + -subj "/C=FR/ST=Denial/L=Springfield/O=Dis/CN=www.passbolt.local" \ -keyout $ssl_key -out $ssl_cert } From ce1394a8ff25f77edb063ef0ba85ea954e27b785 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 31 Jul 2017 11:52:16 +0100 Subject: [PATCH 3/6] version bump passbolt_api --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f52ceed..e2d4a9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.5 MAINTAINER diego@passbolt.com -ENV PASSBOLT_VERSION 1.6.0 +ENV PASSBOLT_VERSION 1.6.1 ENV PASSBOLT_URL https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz ARG BASE_PHP_DEPS="php5-curl \ From c007d4ddf4f2220a241bbff54e59523b64459d2a Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 31 Jul 2017 12:45:34 +0100 Subject: [PATCH 4/6] Registration default description --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 96507f7..95e7272 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Passbolt docker image provides several environment variables to configure differ ### App file variables * FINGERPRINT: GnuPG fingerprint -* REGISTRATION: Defines if users can register +* REGISTRATION: Defines if users can register (defaults to false) * SSL: Forces passbolt to redirect to SSL any non-SSL request ### Core file variables From c4b92dff1bc94e1395626b8e192af062e5037f12 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 31 Jul 2017 16:35:45 +0100 Subject: [PATCH 5/6] updated note for changelog on env vars --- CHANGELOG.md | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e7d79f2..eaf8df0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,20 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v1.6.1...HEAD) ## [1.6.1-1](https://github.com/passbolt/passbolt_docker/compare/v1.6.1...v1.6.1-1) - 2017-07-31 -## Added + +### Notes +This release aims to distribute passbolt-1.6.1 and include most relevant community contributions +The most notable change from user perspective is the switch from lowercase to uppercase environment variables. Users will +have to review their previous scripts and update any environment variable to match the new naming convention. Please refer to PR#39 + +### Added - PASSBOLT-2276: ENV-Variable uppercase convention PR[#39](https://github.com/passbolt/passbolt_docker/pull/39) -- PASSBOLT-2159: Added registration env support PR[#37](https://github.com/passbolt/passbolt_docker/pull/37) -- PASSBOLT-2280: On MacOS systems note you should access it using https PR[#35](https://github.com/passbolt/passbolt_docker/pull/35) - PASSBOLT-2279: Allow Config files to be symbolic links PR[#32](https://github.com/passbolt/passbolt_docker/pull/32) - PASSBOLT-2278: Allow no db environment variable setting PR[#20](https://github.com/passbolt/passbolt_docker/pull/20) +- PASSBOLT-2280: On MacOS systems note you should access it using https PR[#35](https://github.com/passbolt/passbolt_docker/pull/35) + +### Fixed +- PASSBOLT-2159: Added registration env support PR[#37](https://github.com/passbolt/passbolt_docker/pull/37) ## [1.6.1](https://github.com/passbolt/passbolt_docker/compare/v1.6.0...v1.6.1) - 2017-06-29 ### Fixed From 27a519ef9af0d9c1f8fe3047df615e9bb439fdcd Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Tue, 1 Aug 2017 11:48:09 +0200 Subject: [PATCH 6/6] version follows semver --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eaf8df0..858b500 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v1.6.1...HEAD) -## [1.6.1-1](https://github.com/passbolt/passbolt_docker/compare/v1.6.1...v1.6.1-1) - 2017-07-31 +## [1.6.1+1](https://github.com/passbolt/passbolt_docker/compare/v1.6.1...v1.6.1+1) - 2017-07-31 ### Notes This release aims to distribute passbolt-1.6.1 and include most relevant community contributions