diff --git a/Dockerfile b/Dockerfile index 3821e33..b31ed89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ MAINTAINER Glenn ROLLAND RUN apt-get update \ && apt-cache search lib mysql dev$ \ && apt-get install -y \ - wget unzip curl \ + unzip curl \ libfreetype6-dev \ libicu-dev \ libjpeg62-turbo-dev \ @@ -28,19 +28,22 @@ RUN apt-get update \ && docker-php-ext-install imap \ && docker-php-ext-install zip -ADD php-uploads.ini /usr/local/etc/php/conf.d/glenux-uploads.ini -ADD php-performance.ini /usr/local/etc/php/conf.d/glenux-performance.ini -ADD php-errors.ini /usr/local/etc/php/conf.d/glenux-errors.ini +COPY php-uploads.ini /usr/local/etc/php/conf.d/glenux-uploads.ini +COPY php-performance.ini /usr/local/etc/php/conf.d/glenux-performance.ini +COPY php-errors.ini /usr/local/etc/php/conf.d/glenux-errors.ini RUN curl -sS https://getcomposer.org/installer \ | php -- --install-dir=/usr/local/bin --filename=composer -ENV DOLIBARR_VERSION=18.0.4 +ENV DOLIBARR_VERSION=19.0.1 +# ENV DOLIBARR_VERSION=18.0.4 # ENV DOLIBARR_VERSION=17.0.2 # ENV DOLIBARR_VERSION=16.0.4 -RUN wget -q \ - -O /tmp/dolibarr-${DOLIBARR_VERSION}.zip \ - https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip +# https://github.com/Dolibarr/dolibarr/archive/${DOLIBARR_VERSION}.zip +# https://freefr.dl.sourceforge.net/project/dolibarr/Dolibarr%20ERP-CRM/${DOLIBARR_VERSION}/dolibarr-${DOLIBARR_VERSION}.zip +RUN curl -sS \ + https://freefr.dl.sourceforge.net/project/dolibarr/Dolibarr%20ERP-CRM/${DOLIBARR_VERSION}/dolibarr-${DOLIBARR_VERSION}.zip \ + -o /tmp/dolibarr-${DOLIBARR_VERSION}.zip RUN unzip -q -d /usr/src /tmp/dolibarr-${DOLIBARR_VERSION}.zip \ && chown -R www-data:www-data /usr/src/dolibarr-${DOLIBARR_VERSION} \ @@ -59,5 +62,5 @@ RUN sed \ /etc/apache2/sites-enabled/000-default.conf -CMD apache2-foreground +CMD ["apache2-foreground"]