Merge branch 'release/v2.2.0'

CHANGELOG.md

@@ -2,7 +2,20 @@
 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.1.0...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.2.0...HEAD)
+
+## [2.2.0](https://github.com/passbolt/passbolt_docker/compare/v2.1.0...v2.2.0) - 2018-08-13
+
+### Added
+
+- Added [wait-for-it](https://github.com/vishnubob/wait-for-it) instead of wait for to eliminate netcat dependency
+
+### Changed
+
+- Merged: hide nginx and php version [#107](https://github.com/passbolt/passbolt_docker/pull/107)
+- Merged: restrict MySQL port access [#109](https://github.com/passbolt/passbolt_docker/pull/109)
+- Supervisor config files split into conf.d/{php.conf,nginx.conf,cron.conf}
+- Default stdout logging is more verbose now allowing users to see more details on the requests
 
 ## [2.1.0](https://github.com/passbolt/passbolt_docker/compare/v2.0.7...v2.1.0) - 2018-06-14
 

Dockerfile

@@ -2,7 +2,7 @@ FROM php:7-fpm
 
 LABEL maintainer="[email protected]"
 
-ARG PASSBOLT_VERSION="2.1.0"
+ARG PASSBOLT_VERSION="2.2.0"
 ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz"
 
 ARG PHP_EXTENSIONS="gd \
@@ -41,7 +41,6 @@ RUN apt-get update \
          libmcrypt4 \
          mysql-client \
          supervisor \
-         netcat \
          cron \
     && mkdir /home/www-data \
     && chown -R www-data:www-data /home/www-data \
@@ -75,10 +74,12 @@ RUN apt-get update \
     && rm /etc/nginx/sites-enabled/default \
     && apt-get purge -y --auto-remove $PASSBOLT_DEV_PACKAGES \
     && rm -rf /var/lib/apt/lists/* \
-    && rm /usr/local/bin/composer
+    && rm /usr/local/bin/composer \
+    && echo 'php_flag[expose_php] = off' > /usr/local/etc/php-fpm.d/expose.conf \
+    && sed -i 's/# server_tokens/server_tokens/' /etc/nginx/nginx.conf
 
 COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
-COPY conf/supervisord.conf /etc/supervisor/supervisord.conf
+COPY conf/supervisor/*.conf /etc/supervisor/conf.d/
 COPY bin/docker-entrypoint.sh /docker-entrypoint.sh
 
 EXPOSE 80 443

conf/passbolt.conf

@@ -12,6 +12,8 @@ server {
 
   root /var/www/passbolt/webroot;
   index index.php;
+  error_log /dev/stdout info;
+  access_log /dev/stdout;
 
   location / {
     try_files $uri $uri/ /index.php?$args;
@@ -53,6 +55,8 @@ server {
 
   root /var/www/passbolt/webroot;
   index index.php;
+  error_log /dev/stdout info;
+  access_log /dev/stdout;
 
   location / {
     try_files $uri $uri/ /index.php?$args;

conf/supervisor/cron.conf

@@ -0,0 +1,8 @@
+[program:cron]
+command=cron -f -l
+autostart=true
+priority=20
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0

conf/supervisor/nginx.conf

@@ -0,0 +1,8 @@
+[program:nginx]
+command=/usr/sbin/nginx -g 'daemon off;'
+autostart=true
+priority=10
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0

conf/supervisor/php.conf

@@ -0,0 +1,8 @@
+[program:php-fpm]
+command=php-fpm -F
+autostart=true
+priority=5
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0

docker-compose-dev.yml

@@ -7,7 +7,7 @@ services:
     volumes:
       - database_volume:/var/lib/mysql
     ports:
-      - 3306
+      - "127.0.0.1:3306:3306"
 
   passbolt:
     build:

docker-compose-pro.yml

@@ -7,10 +7,10 @@ services:
     volumes:
       - database_volume:/var/lib/mysql
     ports:
-      - 3306
+      - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:2.1.1-pro-debian
+    image: passbolt/passbolt:2.2.0-pro-debian
     tty: true
     depends_on:
       - db

docker-compose.yml

@@ -7,10 +7,10 @@ services:
     volumes:
       - database_volume:/var/lib/mysql
     ports:
-      - 3306
+      - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:2.1.0-debian
+    image: passbolt/passbolt:2.2.0-debian
     tty: true
     depends_on:
       - db