Compare commits

...

5 Commits
4.2.2 ... 4.3.0

Author SHA1 Message Date
Sam
f3b5a62d36 4.3.0 2018-04-08 10:13:25 +02:00
Sam
69d2f54b03 php 7.2 2018-04-05 14:29:10 +02:00
Sam
5a1c1c16d7 fix clean composer 2018-04-04 16:57:39 +02:00
Sam
3ade74efc9 fix Dockerfile 2018-04-04 12:46:21 +02:00
Sam
dc00f6a604 rm composer after build 2018-04-04 12:30:58 +02:00
2 changed files with 13 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
FROM php:7.0-fpm
FROM php:7.2-fpm
MAINTAINER Samuel Laulhau <sam@lalop.co>
@@ -8,14 +8,14 @@ MAINTAINER Samuel Laulhau <sam@lalop.co>
ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
libmcrypt-dev zlib1g-dev git libgmp-dev \
libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \
zlib1g-dev git libgmp-dev \
libfreetype6-dev libjpeg62-turbo-dev libpng-dev \
build-essential chrpath libssl-dev libxft-dev \
libfreetype6 libfontconfig1 libfontconfig1-dev \
&& ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-configure gmp \
&& docker-php-ext-install iconv mcrypt mbstring pdo pdo_mysql zip gd gmp opcache \
&& docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache \
&& curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOMJS}.tar.bz2 \
&& tar xvjf ${PHANTOMJS}.tar.bz2 \
&& rm ${PHANTOMJS}.tar.bz2 \
@@ -44,7 +44,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
# DOWNLOAD AND INSTALL INVOICE NINJA
#####
ENV INVOICENINJA_VERSION 4.2.2
ENV INVOICENINJA_VERSION 4.3.0
RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
&& tar -xzf invoiceninja.tar.gz -C /var/www/ \
@@ -55,7 +55,8 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja
&& chown -R www-data:www-data /var/www/app/bootstrap/cache \
&& mv /var/www/app/storage /var/www/app/docker-backup-storage \
&& mv /var/www/app/public /var/www/app/docker-backup-public \
&& rm -rf /var/www/app/docs /var/www/app/tests
&& rm -rf /var/www/app/docs /var/www/app/tests \
&& rm /usr/local/bin/composer
######

View File

@@ -1,4 +1,4 @@
FROM php:7.0-fpm-alpine
FROM php:7.2-fpm-alpine
MAINTAINER Samuel Laulhau <sam@lalop.co>
@@ -7,13 +7,13 @@ MAINTAINER Samuel Laulhau <sam@lalop.co>
#####
ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
RUN apk update \
&& apk add --no-cache libmcrypt-dev git gmp-dev freetype-dev libjpeg-turbo-dev \
&& apk add --no-cache git gmp-dev freetype-dev libjpeg-turbo-dev \
coreutils chrpath fontconfig libpng-dev
RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-configure gmp \
&& docker-php-ext-install iconv mcrypt mbstring pdo pdo_mysql zip gd gmp opcache \
&& docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache \
&& echo "php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED">>/usr/local/etc/php-fpm.d/www.conf
RUN cd /usr/share \
@@ -42,7 +42,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
# DOWNLOAD AND INSTALL INVOICE NINJA
#####
ENV INVOICENINJA_VERSION 4.2.2
ENV INVOICENINJA_VERSION 4.3.0
RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja/archive/v${INVOICENINJA_VERSION}.tar.gz \
&& tar -xzf invoiceninja.tar.gz -C /var/www/ \
@@ -53,8 +53,8 @@ RUN curl -o invoiceninja.tar.gz -SL https://github.com/hillelcoren/invoice-ninja
&& chown -R www-data:www-data /var/www/app/bootstrap/cache \
&& mv /var/www/app/storage /var/www/app/docker-backup-storage \
&& mv /var/www/app/public /var/www/app/docker-backup-public \
&& rm -rf /var/www/app/docs /var/www/app/tests
&& rm -rf /var/www/app/docs /var/www/app/tests \
&& rm /usr/local/bin/composer
######
# DEFAULT ENV