From 07c160ac81d24dc90bab4b5d41f8f5151b9834f3 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 13 Feb 2019 10:50:10 +0100 Subject: [PATCH 1/3] use php.ini-production and version bump --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f1e075f..f447add 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:7.2-fpm LABEL maintainer="diego@passbolt.com" -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/ From 881c9d754f3c0cedcfcc2b47fceb795078519b80 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 13 Feb 2019 10:50:19 +0100 Subject: [PATCH 2/3] version bump --- docker-compose-pro.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml index dfbb597..d3077ff 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.7.0-pro-debian + image: passbolt/passbolt:2.7.1-pro-debian tty: true depends_on: - db diff --git a/docker-compose.yml b/docker-compose.yml index bb5f1fb..a225b86 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.7.0-debian + image: passbolt/passbolt:2.7.1-debian tty: true depends_on: - db From 8d9a1b9f1d71e96393841c559fa2a22540dfcf1e Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 13 Feb 2019 10:50:28 +0100 Subject: [PATCH 3/3] updated changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a961ef1..1145ae8 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.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