Merge branch 'release/v2.7.1'

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.7.0...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.7.1...HEAD)
+
+## [2.7.1](https://github.com/passbolt/passbolt_docker/compare/v2.7.0...v2.7.1) - 2019-02-13
+
+### Added
+
+- Use php.ini-production for saner defaults in php
 
 ## [2.7.0](https://github.com/passbolt/passbolt_docker/compare/v2.5.0...v2.7.0) - 2019-02-12
 

Dockerfile

@@ -2,7 +2,7 @@ FROM php:7.2-fpm
 
 LABEL maintainer="[email protected]"
 
-ARG PASSBOLT_VERSION="2.7.0"
+ARG PASSBOLT_VERSION="2.7.1"
 ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz"
 
 ARG PHP_EXTENSIONS="gd \
@@ -71,7 +71,9 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/* \
     && rm /usr/local/bin/composer \
     && echo 'php_flag[expose_php] = off' > /usr/local/etc/php-fpm.d/expose.conf \
-    && sed -i 's/# server_tokens/server_tokens/' /etc/nginx/nginx.conf
+    && sed -i 's/# server_tokens/server_tokens/' /etc/nginx/nginx.conf \
+    && mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
 
 COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
 COPY conf/supervisor/*.conf /etc/supervisor/conf.d/

docker-compose-pro.yml

@@ -10,7 +10,7 @@ services:
       - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:2.7.0-pro-debian
+    image: passbolt/passbolt:2.7.1-pro-debian
     tty: true
     depends_on:
       - db

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:2.7.0-debian
+    image: passbolt/passbolt:2.7.1-debian
     tty: true
     depends_on:
       - db