Merge branch 'release/v2.0.2'

CHANGELOG.md

@@ -2,7 +2,18 @@
 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)
+
+## 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
 

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

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" ] || \

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

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

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