Compare commits

..

6 Commits
3.3.3 ... 3.4.2

Author SHA1 Message Date
Sam
c97fd64020 3.4.2 2017-06-30 14:45:02 +02:00
Sam
467960061b 3.4.1 2017-06-22 20:48:57 +02:00
Sam
2dfa7e1edd 3.4.0 2017-06-18 12:53:09 +02:00
Sam
475b3e7121 notice on phantomjs/alpine 2017-06-18 12:52:36 +02:00
Sam
7c40a5a813 alpine change phantomjs bin path 2017-06-11 16:55:34 +02:00
Sam
b92c8d928e fix phantomjs install in alpine 2017-06-11 14:25:18 +02:00
3 changed files with 14 additions and 21 deletions

View File

@@ -44,7 +44,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
# DOWNLOAD AND INSTALL INVOICE NINJA
#####
ENV INVOICENINJA_VERSION 3.3.3
ENV INVOICENINJA_VERSION 3.4.2
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/ \

View File

@@ -32,3 +32,6 @@ docker run -d
A list of environment variables can be found [here](https://github.com/invoiceninja/invoiceninja/blob/master/.env.example)
### Know issue
Phantomjs doesn't work on linux alpine https://github.com/ariya/phantomjs/issues/14186

View File

@@ -6,30 +6,20 @@ MAINTAINER Samuel Laulhau <sam@lalop.co>
# SYSTEM REQUIREMENT
#####
ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
RUN apk update
RUN apk add libmcrypt-dev
# RUN apk add zlib1g-dev
RUN apk add git
RUN apk add gmp-dev
RUN apk add freetype-dev
RUN apk add libjpeg-turbo-dev
RUN apk add libpng-dev
RUN apk add coreutils
RUN apk add chrpath
# RUN apk add libssl-dev
# RUN apk add libxft-dev \
# libfreetype6 libfontconfig1 libfontconfig1-dev \
RUN apk update \
&& apk add --no-cache libmcrypt-dev 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 \
&& curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOMJS}.tar.bz2 \
&& tar xvjf ${PHANTOMJS}.tar.bz2 \
&& rm ${PHANTOMJS}.tar.bz2 \
&& mv ${PHANTOMJS} /usr/local/share \
&& ln -sf /usr/local/share/${PHANTOMJS}/bin/phantomjs /usr/local/bin \
&& rm -rf /var/lib/apt/lists/* \
&& 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 \
&& curl -L https://github.com/Overbryd/docker-phantomjs-alpine/releases/download/2.11/phantomjs-alpine-x86_64.tar.bz2 | tar xj \
&& ln -s /usr/share/phantomjs/phantomjs /usr/local/bin/phantomjs
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
@@ -52,7 +42,7 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
# DOWNLOAD AND INSTALL INVOICE NINJA
#####
ENV INVOICENINJA_VERSION 3.3.3
ENV INVOICENINJA_VERSION 3.4.2
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/ \