Merge tag 'v2.4.0' into develop

v2.4.0
This commit is contained in:
Diego Lendoiro 2018-10-15 09:22:59 +02:00
commit 6eb5ee5c17
4 changed files with 14 additions and 10 deletions

View File

@ -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

View File

@ -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 \

View File

@ -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

View File

@ -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