Merge branch 'release/v1.6.9'

CHANGELOG.md

@@ -2,7 +2,22 @@
 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/v1.6.5+1...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v1.6.9...HEAD)
+
+## [1.6.9](https://github.com/passbolt/passbolt_docker/compare/v1.6.5+1...v1.6.9) - 2018-01-14
+
+This release provides the last passbolt_api 1.x series release along with several pull requests
+and fixes.
+
+### Fixed
+
+- Unable to access default installation with http [#59](https://github.com/passbolt/passbolt_docker/issues/59)
+- Check and correct the permissions and ownership of /var/www/passbolt [#67](https://github.com/passbolt/passbolt_docker/issues/67)
+- cp: Unrecognized option -T [#75](https://github.com/passbolt/passbolt_docker/issues/75)
+- turn URL config independent from SSL var [#76](https://github.com/passbolt/passbolt_docker/pull/76)
+- Set the default MySQL port to 3306 [#77](https://github.com/passbolt/passbolt_docker/pull/77)
+- Add environment variable to set email client [#81](https://github.com/passbolt/passbolt_docker/pull/81)
+
 
 ## [1.6.5+1](https://github.com/passbolt/passbolt_docker/compare/v1.6.5...v1.6.5+1) - 2017-11-14
 

Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.6
 
 LABEL maintainer="diego@passbolt.com"
 
-ENV PASSBOLT_VERSION 1.6.5
+ENV PASSBOLT_VERSION 1.6.9
 ENV PASSBOLT_URL https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz
 
 ARG BASE_PHP_DEPS="php5-curl \
@@ -38,6 +38,7 @@ ARG PHP_GNUPG_DEPS="php5-dev \
 
 RUN apk add --no-cache $BASE_PHP_DEPS \
       sed \
+      coreutils \
       tar \
       bash \
       curl \

bin/docker-entrypoint.sh

@@ -166,6 +166,12 @@ php_fpm_setup() {
   sed -i '/^include\s/ s:^:#:' /etc/php5/fpm.d/www.conf
 }
 
+check_permissions() {
+  chown -R nginx:nginx /var/www/passbolt
+  chmod -R +w /var/www/passbolt/app/tmp
+  chmod +w /var/www/passbolt/app/webroot/img/public
+}
+
 email_cron_job() {
   local root_crontab='/etc/crontabs/root'
   local cron_task_dir='/etc/periodic/1min'
@@ -184,7 +190,6 @@ email_cron_job() {
   crond -f -c /etc/crontabs &
 }
 
-
 if [ ! -f $gpg_private_key ] && [ ! -L $gpg_private_key ] || \
    [ ! -f $gpg_public_key ] && [ ! -L $gpg_public_key ]; then
   gpg_gen_key
@@ -213,6 +218,8 @@ if [ ! -f $ssl_key ] && [ ! -L $ssl_key ] && \
   gen_ssl_cert
 fi
 
+check_permissions
+
 php_fpm_setup
 
 install

conf/passbolt.conf

@@ -4,7 +4,6 @@ server {
   client_body_buffer_size     100K;
   client_header_buffer_size   1k;
   client_max_body_size        100k;
-  large_client_header_buffers 2 1k;
 
   client_body_timeout   10;
   client_header_timeout 10;