Merge branch 'release/1.6.1+1'

CHANGELOG.md

@@ -4,7 +4,21 @@ 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
+
+### 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-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

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 \

README.md

@@ -67,14 +67,14 @@ 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
 
 * 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
 

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
@@ -86,7 +86,6 @@ app_setup() {
   local default_public_key='unsecure.key'
   local default_private_key='unsecure_private.key'
   local default_fingerprint='2FC8945833C51946E937F9FED47B0811573EE67E'
-  local default_registration='public'
   local gpg_home='/var/lib/nginx/.gnupg'
   local auto_fingerprint=$(su -m -c "$gpg --fingerprint |grep fingerprint| awk '{for(i=4;i<=NF;++i)printf \$i}'" -ls /bin/bash nginx)
 
@@ -96,6 +95,7 @@ app_setup() {
   sed -i s:$default_private_key:serverkey.private.asc:g $app_config
   sed -i s:$default_fingerprint:${FINGERPRINT:-$auto_fingerprint}:g $app_config
   sed -i "/force/ s:true:${SSL:-true}:" $app_config
+  sed -i "/'registration'/{n; s:false:${REGISTRATION:-false}:}" $app_config
 }
 
 email_setup() {
@@ -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
 }