From 3bcd72a1abeeaf8d202a2828d3b1caaca02312f8 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 16 Aug 2017 12:54:30 +0100 Subject: [PATCH 1/6] upgraded alpine version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e2d4a9e..703ebac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.5 +FROM alpine:3.6 MAINTAINER diego@passbolt.com From 5f3bd67a500f437e4370c1c4e785f3449d346dfe Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 16 Aug 2017 15:58:14 +0100 Subject: [PATCH 2/6] symlinks for php5 and php5ize --- Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 703ebac..f64cefe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,6 @@ ARG BASE_PHP_DEPS="php5-curl \ php5-intl \ php5-json \ php5-mcrypt \ - php5-memcache \ php5-mysql \ php5-xsl \ php5-fpm \ @@ -34,6 +33,7 @@ ARG PHP_GNUPG_DEPS="php5-dev \ re2c \ gpgme-dev \ autoconf \ + zlib-dev \ file" RUN apk update &&\ @@ -53,9 +53,12 @@ RUN apk update &&\ nginx RUN apk add $PHP_GNUPG_DEPS && \ + ln -s /usr/bin/php5 /usr/bin/php && \ + ln -s /usr/bin/phpize5 /usr/bin/phpize && \ #https://bugs.alpinelinux.org/issues/5378 sed -i "s/ -n / /" $(which pecl) && \ - pecl install gnupg && \ + pecl install gnupg memcache && \ + echi "extension=memcache.so" > /etc/php5/conf.d/memcache.ini && \ echo "extension=gnupg.so" > /etc/php5/conf.d/gnupg.ini && \ apk del $PHP_GNUPG_DEPS From e1bac6198710cf8bb9b2afd5c91fa93a1bb9dbba Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 16 Aug 2017 16:10:42 +0100 Subject: [PATCH 3/6] memcache extension enabled --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f64cefe..85d9c2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -58,7 +58,7 @@ RUN apk add $PHP_GNUPG_DEPS && \ #https://bugs.alpinelinux.org/issues/5378 sed -i "s/ -n / /" $(which pecl) && \ pecl install gnupg memcache && \ - echi "extension=memcache.so" > /etc/php5/conf.d/memcache.ini && \ + echo "extension=memcache.so" > /etc/php5/conf.d/memcache.ini && \ echo "extension=gnupg.so" > /etc/php5/conf.d/gnupg.ini && \ apk del $PHP_GNUPG_DEPS From dfe5c7b04d62125a7f7618e0b3402e6d81deb519 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 16 Aug 2017 16:31:22 +0100 Subject: [PATCH 4/6] dockerfile readability --- Dockerfile | 51 ++++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index 85d9c2f..ab9409f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,40 +36,37 @@ ARG PHP_GNUPG_DEPS="php5-dev \ zlib-dev \ file" -RUN apk update &&\ - apk add $BASE_PHP_DEPS \ - bash \ +RUN apk add --no-cache $BASE_PHP_DEPS \ sed \ - ca-certificates \ - curl \ tar \ - libpcre32 \ - recode \ - libxml2 \ + bash \ + curl \ + nginx \ gpgme \ gnupg1 \ - mysql-client \ + recode \ + libxml2 \ openssl \ - nginx + libpcre32 \ + mysql-client \ + ca-certificates -RUN apk add $PHP_GNUPG_DEPS && \ - ln -s /usr/bin/php5 /usr/bin/php && \ - ln -s /usr/bin/phpize5 /usr/bin/phpize && \ +RUN apk add --no-cache $PHP_GNUPG_DEPS \ + && ln -s /usr/bin/php5 /usr/bin/php \ + && ln -s /usr/bin/phpize5 /usr/bin/phpize \ #https://bugs.alpinelinux.org/issues/5378 - sed -i "s/ -n / /" $(which pecl) && \ - pecl install gnupg memcache && \ - echo "extension=memcache.so" > /etc/php5/conf.d/memcache.ini && \ - echo "extension=gnupg.so" > /etc/php5/conf.d/gnupg.ini && \ - apk del $PHP_GNUPG_DEPS - -RUN curl -sS https://getcomposer.org/installer | php && \ - mv composer.phar /usr/local/bin/composer - -RUN mkdir /var/www/passbolt && curl -sSL $PASSBOLT_URL | \ - tar zxf - -C /var/www/passbolt --strip-components 1 && \ - chown -R nginx:nginx /var/www/passbolt && \ - chmod -R +w /var/www/passbolt/app/tmp && \ - chmod +w /var/www/passbolt/app/webroot/img/public + && sed -i "s/ -n / /" $(which pecl) \ + && pecl install gnupg memcache \ + && echo "extension=memcache.so" > /etc/php5/conf.d/memcache.ini \ + && echo "extension=gnupg.so" > /etc/php5/conf.d/gnupg.ini \ + && apk del $PHP_GNUPG_DEPS \ + && curl -sS https://getcomposer.org/installer | php \ + && mv composer.phar /usr/local/bin/composer \ + && mkdir /var/www/passbolt \ + && curl -sSL $PASSBOLT_URL | tar zxf - -C /var/www/passbolt --strip-components 1 \ + && chown -R nginx:nginx /var/www/passbolt \ + && chmod -R +w /var/www/passbolt/app/tmp \ + && chmod +w /var/www/passbolt/app/webroot/img/public COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf COPY bin/docker-entrypoint.sh /docker-entrypoint.sh From 2b83e5b274f494434b5aff89a35c07a22b40604d Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 16 Aug 2017 16:50:17 +0100 Subject: [PATCH 5/6] passbolt-1.6.2 version bump --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ab9409f..4aaac03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:3.6 MAINTAINER diego@passbolt.com -ENV PASSBOLT_VERSION 1.6.1 +ENV PASSBOLT_VERSION 1.6.2 ENV PASSBOLT_URL https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz ARG BASE_PHP_DEPS="php5-curl \ From 5ea11f2224dd94467e8d119c0e0e039ae5388870 Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Wed, 16 Aug 2017 16:50:50 +0100 Subject: [PATCH 6/6] updated changelog --- CHANGELOG.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 858b500..9188f64 100644 --- a/CHANGELOG.md +++ b/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/v1.6.1...HEAD) +## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v1.6.2...HEAD) + +## [1.6.2](https://github.com/passbolt/passbolt_docker/compare/v1.6.1+1...v1.6.2) - 2017-08-16 + +### Added + +- PASSBOLT-2295: Added environment variable DB_PORT for non standard database ports. [#43](https://github.com/passbolt/passbolt_docker/issues/43) +- PASSBOLT-2321: Upgraded passbolt container to latest stable alpine (3.6) + +### Fixed +- PASSBOLT-2319: Fullbaseurl parameter was not changing when specifying URL [#50](https://github.com/passbolt/passbolt_docker/issues/50) +- PASSBOLT-2320: TLS value on email.php should not be quoted PR[#53](https://github.com/passbolt/passbolt_docker/pull/53) ## [1.6.1+1](https://github.com/passbolt/passbolt_docker/compare/v1.6.1...v1.6.1+1) - 2017-07-31