Merge branch 'release/v2.9.0'

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.8.4...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.9.0...HEAD)
+
+## [2.9.0](https://github.com/passbolt/passbolt_docker/compare/v2.8.4...v2.9.0) - 2019-04-24
+
+### Added
+
+- Build arg to pass headers to curl
+- Removed git as dev dependency
+
+### Fixed
+
+- Fix typo in Readme [#125](https://github.com/passbolt/passbolt_docker/pull/125)
 
 ## [2.8.4](https://github.com/passbolt/passbolt_docker/compare/v2.8.3...v2.8.4) - 2019-04-17
 

Dockerfile

@@ -2,8 +2,9 @@ FROM php:7.2-fpm
 
 LABEL maintainer="[email protected]"
 
-ARG PASSBOLT_VERSION="2.8.4"
+ARG PASSBOLT_VERSION="2.9.0"
 ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz"
+ARG PASSBOLT_CURL_HEADERS=""
 
 ARG PHP_EXTENSIONS="gd \
       intl \
@@ -21,8 +22,7 @@ ARG PASSBOLT_DEV_PACKAGES="libgpgme11-dev \
       libicu-dev \
       libxslt1-dev \
       libmcrypt-dev \
-      unzip \
-      git"
+      unzip"
 
 ARG PASSBOLT_BASE_PACKAGES="nginx \
          gnupg \
@@ -62,7 +62,8 @@ RUN apt-get update \
        fi \
     && php composer-setup.php \
     && mv composer.phar /usr/local/bin/composer \
-    && curl -sSL $PASSBOLT_URL | tar zxf - -C . --strip-components 1 \
+    && rm composer-setup.php \
+    && curl -sSL -H "$PASSBOLT_CURL_HEADERS" "$PASSBOLT_URL" | tar zxf - -C . --strip-components 1 \
     && composer install -n --no-dev --optimize-autoloader \
     && chown -R www-data:www-data . \
     && chmod 775 $(find /var/www/passbolt/tmp -type d) \
@@ -77,7 +78,6 @@ RUN apt-get update \
     && sed -i 's/# server_tokens/server_tokens/' /etc/nginx/nginx.conf \
     && mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
-
 COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
 COPY conf/supervisor/*.conf /etc/supervisor/conf.d/
 COPY bin/docker-entrypoint.sh /docker-entrypoint.sh

README.md

@@ -113,7 +113,7 @@ Passbolt docker image provides several environment variables to configure differ
 | PASSBOLT_SECURITY_SET_HEADERS       | Send CSP Headers                 | true | | SECURITY_SALT                       | CakePHP security salt            | __SALT__ |
 
 For more env variables supported please check [default.php](https://github.com/passbolt/passbolt_api/blob/master/config/default.php)
-For more env variables supported please check [app.default.php](https://github.com/passbolt/passbolt_api/blob/master/config/app.default.php)
+and [app.default.php](https://github.com/passbolt/passbolt_api/blob/master/config/app.default.php)
 
 ### Configuration files
 

docker-compose-pro.yml

@@ -10,7 +10,7 @@ services:
       - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:2.8.4-pro-debian
+    image: passbolt/passbolt:2.9.0-pro-debian
     tty: true
     depends_on:
       - db

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - "127.0.0.1:3306:3306"
 
   passbolt:
-    image: passbolt/passbolt:2.8.4-debian
+    image: passbolt/passbolt:2.9.0-debian
     tty: true
     depends_on:
       - db