added supervisor, depdencies reorg and directory structure

This commit is contained in:
Diego Lendoiro 2018-01-08 09:20:41 +01:00
parent 389b957f2f
commit 5c0b52d249
1 changed files with 18 additions and 13 deletions

View File

@ -1,4 +1,4 @@
FROM php:7-fpm-alpine FROM php:7-fpm-alpine3.7
LABEL MAINTAINER diego@passbolt.com LABEL MAINTAINER diego@passbolt.com
@ -7,7 +7,6 @@ ENV PASSBOLT_URL https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VE
ARG PHP_EXTENSIONS="gd \ ARG PHP_EXTENSIONS="gd \
intl \ intl \
mcrypt \
xsl" xsl"
ARG PHP_GNUPG_BUILD_DEPS="php7-dev \ ARG PHP_GNUPG_BUILD_DEPS="php7-dev \
@ -20,31 +19,37 @@ ARG PHP_GNUPG_BUILD_DEPS="php7-dev \
gpgme-dev \ gpgme-dev \
autoconf \ autoconf \
zlib-dev \ zlib-dev \
libmcrypt-dev \
file" file"
RUN apk add --no-cache $PHP_EXTENSIONS \ RUN apk add --no-cache $PHP_GNUPG_BUILD_DEPS \
$PHP_GNUPG_BUILD_DEPS \
sed \ sed \
bash \
nginx \ nginx \
gpgme \ gpgme \
gnupg1 \ gnupg1 \
mysql-client mysql-client \
libpng-dev \
RUN apk add --no-cache $PHP_GNUPG_DEPS \ icu-dev \
&& pecl install gnupg \ libxslt-dev \
&& echo "extension=gnupg.so" > /etc/php7/conf.d/gnupg.ini \ libmcrypt-dev \
&& apk del $PHP_GNUPG_DEPS \ supervisor \
&& pecl install gnupg redis mcrypt-snapshot \
&& docker-php-ext-install -j4 $PHP_EXTENSIONS \
&& docker-php-ext-enable $PHP_EXTENSIONS gnupg redis mcrypt \
&& apk del $PHP_GNUPG_BUILD_DEPS \
&& curl -sS https://getcomposer.org/installer | php \ && curl -sS https://getcomposer.org/installer | php \
&& mv composer.phar /usr/local/bin/composer && mv composer.phar /usr/local/bin/composer
RUN mkdir /var/www/passbolt \ RUN mkdir /var/www/passbolt \
&& curl -sSL $PASSBOLT_URL | tar zxf - -C /var/www/passbolt --strip-components 1 \ && curl -sSL $PASSBOLT_URL | tar zxf - -C /var/www/passbolt --strip-components 1 \
&& chown -R nginx:nginx /var/www/passbolt \ && chown -R nginx:nginx /var/www/passbolt \
&& chmod -R a-w /var/www/passbolt \ && chmod -R o-w /var/www/passbolt \
&& chmod -R +w /var/www/passbolt/app/tmp \ && chmod -R +w /var/www/passbolt/tmp \
&& chmod -R +w /var/www/passbolt/app/webroot/img/public && chmod -R +w /var/www/passbolt/webroot/img/public
COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
COPY conf/supervisord.conf /etc/supervisord.conf
COPY bin/docker-entrypoint.sh /docker-entrypoint.sh COPY bin/docker-entrypoint.sh /docker-entrypoint.sh
EXPOSE 80 443 EXPOSE 80 443