From 5359ec4cedeb1ee1611e8ba4628b7d9f1dae1264 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 15 Oct 2018 09:00:03 +0200 Subject: [PATCH 1/3] removed duplicate ARG PHP_EXTENSIONS --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1438316..2115fe6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,9 @@ FROM php:7-fpm LABEL maintainer="diego@passbolt.com" -ARG PASSBOLT_VERSION="2.3.0" +ARG PASSBOLT_VERSION="2.4" ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz" -ARG PHP_EXTENSIONS="gd \ - intl \ - pdo_mysql \ - xsl" - - ARG PHP_EXTENSIONS="gd \ intl \ pdo_mysql \ From 2448491d46f419c703efb28193891979b778cf9d Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 15 Oct 2018 09:00:52 +0200 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 51ce15a..b2f909e 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.3.0-pro-debian + image: passbolt/passbolt:2.4.0-pro-debian tty: true depends_on: - db diff --git a/docker-compose.yml b/docker-compose.yml index 0e67fc8..f473a39 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.3.0-debian + image: passbolt/passbolt:2.4.0-debian tty: true depends_on: - db From 9f47007b0794fa27bc6c104f4cd0b957477f3779 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 15 Oct 2018 09:19:58 +0200 Subject: [PATCH 3/3] updated changelog for 2.4.0 --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ace883..08be30c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,17 @@ 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.3.0...HEAD) +## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.4.0...HEAD) + +## [2.4.0](https://github.com/passbolt/passbolt_docker/compare/v2.3.0...v2.4.0) - 2018-10-15 + +### Added + +- Merged: Adding SSL configuration for mysql/mariadb [#111](https://github.com/passbolt/passbolt_docker/pull/111) + +### Fixed + +- Minor fix: Remove duplicate arg PHP_EXTENSIONS from Dockerfile ## [2.3.0](https://github.com/passbolt/passbolt_docker/compare/v2.2.0...v2.3.0) - 2018-09-03