From d75e78e4eb73b8dc96c6a83f8e300cc24b5aaf5c Mon Sep 17 00:00:00 2001 From: Harsh Gadgil Date: Sun, 22 Apr 2018 01:37:32 -0400 Subject: [PATCH 1/5] Replace php copy with curl for use with proxy php `copy` connects directly...it does not use the specified `https_proxy` or `http_proxy` environment variables. A third parameter can be added to `copy` to use the proxy, but this needlessly complicates things. Replacing `copy` with `curl` enables the use of preset proxy environment variables. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c47493c..873acfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,7 +56,7 @@ RUN apt-get update \ && docker-php-ext-enable $PHP_EXTENSIONS $PECL_PASSBOLT_EXTENSIONS \ && docker-php-source delete \ && EXPECTED_SIGNATURE=$(curl -s https://composer.github.io/installer.sig) \ - && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ + && curl -o composer-setup.php https://getcomposer.org/installer \ && ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', 'composer-setup.php');") \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then \ >&2 echo 'ERROR: Invalid installer signature'; \ From 06387f8c1b18cd628bd09f6c918f5a33546dc331 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Thu, 26 Apr 2018 13:06:19 +0200 Subject: [PATCH 2/5] version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 873acfd..e1f19c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:7-fpm LABEL maintainer="diego@passbolt.com" -ARG PASSBOLT_VERSION="2.0.3" +ARG PASSBOLT_VERSION="2.0.4" ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz" ARG PHP_EXTENSIONS="gd \ From 2e9afc8526209feef4ea9811602c8927d569de9b Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Thu, 26 Apr 2018 13:08:52 +0200 Subject: [PATCH 3/5] version bump passbolt switched to mariadb. Fixes #103 --- docker-compose-dev.yml | 2 +- docker-compose-pro.yml | 4 ++-- docker-compose.yml | 4 ++-- spec/docker_runtime/runtime_spec.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 8aa644c..289f723 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,7 +1,7 @@ version: '3.4' services: db: - image: mysql:latest + image: mariadb:latest env_file: - env/mysql.env volumes: diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml index 0fc8571..284d8e9 100644 --- a/docker-compose-pro.yml +++ b/docker-compose-pro.yml @@ -1,7 +1,7 @@ version: '3.4' services: db: - image: mysql:latest + image: mariadb:latest env_file: - env/mysql.env volumes: @@ -10,7 +10,7 @@ services: - 3306 passbolt: - image: passbolt/passbolt:2.0.3-pro-debian + image: passbolt/passbolt:2.0.4-pro-debian tty: true depends_on: - db diff --git a/docker-compose.yml b/docker-compose.yml index cfca8e3..6d6964e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' services: db: - image: mysql:latest + image: mariadb:latest env_file: - env/mysql.env volumes: @@ -10,7 +10,7 @@ services: - 3306 passbolt: - image: passbolt/passbolt:2.0.3-debian + image: passbolt/passbolt:2.0.4-debian tty: true depends_on: - db diff --git a/spec/docker_runtime/runtime_spec.rb b/spec/docker_runtime/runtime_spec.rb index 0ce9062..f9e7b2f 100644 --- a/spec/docker_runtime/runtime_spec.rb +++ b/spec/docker_runtime/runtime_spec.rb @@ -16,7 +16,7 @@ describe 'passbolt_api service' do "mysqladmin ping --silent" ] }, - 'Image' => 'mysql') + 'Image' => 'mariadb') @mysql.start while @mysql.json['State']['Health']['Status'] != 'healthy' From 1df53e7017f4a1236882a7f736b98318409307c4 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Thu, 26 Apr 2018 15:18:59 +0200 Subject: [PATCH 4/5] updated readme --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 9521f25..c235b8d 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,12 @@ Passbolt is a free and open source password manager that allows team members to store and share credentials securely. +# Requirements: + +* rng-tools or haveged are required on host machine to speed up entropy generation on containers. +This way gpg key creation on passbolt container will be faster. +* mariadb/mysql >= 5.0 + # Usage Users are encouraged to use [official docker image from the docker hub](https://hub.docker.com/r/passbolt/passbolt/). From b0de1d28cfb1657eaf8409631ee729eab068fc10 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Thu, 26 Apr 2018 15:19:11 +0200 Subject: [PATCH 5/5] updated changelog v2.0.4 --- CHANGELOG.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be85964..4d717fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,19 @@ 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.0.3...HEAD) +## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.0.4...HEAD) + +## [2.0.4](https://github.com/passbolt/passbolt_docker/compare/v2.0.2...v2.0.4) - 2018-04-26 + +### Fixed + +- Authentication plugin 'caching_sha2_password' cannot be loaded [#103](https://github.com/passbolt/passbolt_docker/issues/103) + +### Changed + +- MariaDB as default SQL backend option in docker-compose files related with [#103](https://github.com/passbolt/passbolt_docker/issues/103) +- Replace php copy with curl for use with proxy [#102](https://github.com/passbolt/passbolt_docker/pull/102) +- Documentation requirements moved up in the README ## [2.0.3](https://github.com/passbolt/passbolt_docker/compare/v2.0.2...v2.0.3) - 2018-04-20