Merge tag 'v1.6.2' into develop

[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)
This commit is contained in:
Diego Lendoiro 2017-08-16 16:52:37 +01:00
commit 52e4832174
2 changed files with 39 additions and 28 deletions

View File

@ -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

View File

@ -1,8 +1,8 @@
FROM alpine:3.5
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 \
@ -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,39 +33,40 @@ ARG PHP_GNUPG_DEPS="php5-dev \
re2c \
gpgme-dev \
autoconf \
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 && \
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 && \
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