From 5b52c86724fb82a2d8f3a3df3569e4c38f133121 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 16 Apr 2018 14:37:31 +0200 Subject: [PATCH 1/6] if container is restarted dont add new cronjobs. Fixes #98 --- bin/docker-entrypoint.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh index 8431bcd..4b2999d 100755 --- a/bin/docker-entrypoint.sh +++ b/bin/docker-entrypoint.sh @@ -74,9 +74,10 @@ email_cron_job() { printenv > /etc/environment sed -i 's/=\(.*\)/="\1"/g' /etc/environment cron_task='/etc/cron.d/passbolt_email' - echo "* * * * * su -c \"source /etc/environment ; /var/www/passbolt/bin/cake EmailQueue.sender\" -s /bin/bash www-data >> /var/log/cron.log 2>&1" >> $cron_task - - crontab /etc/cron.d/passbolt_email + if [ ! -f "$cron_task" ]; then + echo "* * * * * su -c \"source /etc/environment ; /var/www/passbolt/bin/cake EmailQueue.sender\" -s /bin/bash www-data >> /var/log/cron.log 2>&1" >> $cron_task + crontab /etc/cron.d/passbolt_email + fi } if [ ! -f "$gpg_private_key" ] && [ ! -L "$gpg_private_key" ] || \ From 8a06ffab0c326638533774c9e52a965edbc930cb Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Mon, 16 Apr 2018 21:12:57 +0200 Subject: [PATCH 2/6] added support for libjpeg in gd. Fixes #100 --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 39fdae3..bc47cc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ ARG PECL_PASSBOLT_EXTENSIONS="gnupg \ ARG PASSBOLT_DEV_PACKAGES="libgpgme11-dev \ libpng-dev \ + libjpeg62-turbo-dev \ libicu-dev \ libxslt1-dev \ libmcrypt-dev \ @@ -50,6 +51,7 @@ RUN apt-get update \ mkdir $PHP_EXT_DIR/$i; \ curl -sSL $PECL_BASE_URL/$i | tar zxf - -C $PHP_EXT_DIR/$i --strip-components 1; \ done \ + && docker-php-ext-configure gd --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install -j4 $PHP_EXTENSIONS $PECL_PASSBOLT_EXTENSIONS \ && docker-php-ext-enable $PHP_EXTENSIONS $PECL_PASSBOLT_EXTENSIONS \ && docker-php-source delete \ From b9dba26a9ad17b24b4250a69d66dfa36599112be Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Tue, 17 Apr 2018 10:49:09 +0200 Subject: [PATCH 3/6] version bump --- Dockerfile | 2 +- docker-compose-pro.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc47cc5..63564e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM php:7-fpm LABEL maintainer="diego@passbolt.com" -ARG PASSBOLT_VERSION="2.0.1" +ARG PASSBOLT_VERSION="2.0.2" ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz" ARG PHP_EXTENSIONS="gd \ diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml index 43558d8..9992ef3 100644 --- a/docker-compose-pro.yml +++ b/docker-compose-pro.yml @@ -10,7 +10,7 @@ services: - 3306 passbolt: - image: passbolt/passbolt:2.0.1-pro-debian + image: passbolt/passbolt:2.0.2-pro-debian tty: true depends_on: - db diff --git a/docker-compose.yml b/docker-compose.yml index 5c01302..096cfeb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: - 3306 passbolt: - image: passbolt/passbolt:2.0.1-debian + image: passbolt/passbolt:2.0.2-debian tty: true depends_on: - db From 2272f572d766d5a7f343c8f9ed7b42796974607e Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Tue, 17 Apr 2018 10:49:26 +0200 Subject: [PATCH 4/6] update changelog for 2.0.2 version --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0726138..b5a444b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,14 @@ 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.0...HEAD) +## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.0.1...HEAD) + +## [2.0.2](https://github.com/passbolt/passbolt_docker/compare/v2.0.1...v2.0.2) - 2018-04-17 + +## Fixed + +- Unable to load a jpeg image as avatar. [#100](https://github.com/passbolt/passbolt_docker/issues/100) +- docker-entrypoint.sh adds email-sending-job everytime you restart the container. [#98](https://github.com/passbolt/passbolt_docker/issues/98) ## [2.0.1](https://github.com/passbolt/passbolt_docker/compare/v2.0.0...v2.0.1) - 2018-04-09 From 59cc8b8ebef2e5e6ed9cf566a149743fdabbe985 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Tue, 17 Apr 2018 11:20:21 +0200 Subject: [PATCH 5/6] removed composer binary --- Dockerfile | 3 ++- spec/docker_image/image_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 63564e1..4acbd6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,7 +74,8 @@ RUN apt-get update \ && chmod 664 $(find /var/www/passbolt/webroot/img/public -type f) \ && rm /etc/nginx/sites-enabled/default \ && apt-get purge -y --auto-remove $PASSBOLT_DEV_PACKAGES \ - && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* \ + && rm /usr/local/bin/composer COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf COPY conf/supervisord.conf /etc/supervisor/supervisord.conf diff --git a/spec/docker_image/image_spec.rb b/spec/docker_image/image_spec.rb index 81288ef..7964b14 100644 --- a/spec/docker_image/image_spec.rb +++ b/spec/docker_image/image_spec.rb @@ -38,8 +38,8 @@ describe 'Dockerfile' do end describe 'php composer' do - it 'is installed' do - expect(file(composer)).to be_executable + it 'is not installed' do + expect(file(composer)).to_not exist end end From 842a09a2d3c63a2e36612fa7a3b36bf215a4abe4 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Tue, 17 Apr 2018 11:21:45 +0200 Subject: [PATCH 6/6] updated changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5a444b..bfc3a0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Unable to load a jpeg image as avatar. [#100](https://github.com/passbolt/passbolt_docker/issues/100) - docker-entrypoint.sh adds email-sending-job everytime you restart the container. [#98](https://github.com/passbolt/passbolt_docker/issues/98) +## Changed + +- Removed composer binary after dependency installation. + ## [2.0.1](https://github.com/passbolt/passbolt_docker/compare/v2.0.0...v2.0.1) - 2018-04-09 - Decrypt bug fix. Check https://github.com/passbolt/passbolt_api