From caf8e5c1ffc10673e972021bc914e2c9e9e1d06d Mon Sep 17 00:00:00 2001 From: Daniel Del Rio Figueira Date: Thu, 18 Mar 2021 16:04:36 +0100 Subject: [PATCH 1/2] Changed: fix ln command syntax --- dev/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/Dockerfile b/dev/Dockerfile index f631edf..6632dd0 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -79,7 +79,7 @@ RUN apt-get update \ && mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ && echo "* * * * * su -c \"source /etc/environment ; /var/www/passbolt/bin/cake EmailQueue.sender\" -s /bin/bash www-data >> /var/log/cron.log 2>&1" >> /etc/cron.d/passbolt_email \ && crontab /etc/cron.d/passbolt_email \ - && ln -s $(which php-fpm){,7.3} + && ln -s $(which php-fpm) $(which php-fpm)7.3 COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf COPY conf/supervisor/*.conf /etc/supervisor/conf.d/ From ac776f4824bb321493e295194a7c60bd4cb7f11d Mon Sep 17 00:00:00 2001 From: Daniel Del Rio Figueira Date: Thu, 18 Mar 2021 16:09:26 +0100 Subject: [PATCH 2/2] Changed: update changelog for v.3.1.0 --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2e0b8a..a42619f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,12 @@ 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/v3.0.1...HEAD) +## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v3.1.0...HEAD) + +## [3.1.0](https://github.com/passbolt/passbolt_docker/compare/v3.0.2...v3.1.0) - 2021-03-18 + +- This is a sync release. Check [changes](https://github.com/passbolt/passbolt_api/compare/v3.0.2...v3.1.0) for passbolt_api +- Fix dev Dockerfile ln command syntax ## [3.0.2](https://github.com/passbolt/passbolt_docker/compare/v3.0.1...v3.0.2) - 2021-03-12