From 5db6f11f403d55795deeda544ac996c94b8e272f Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Mon, 15 Jan 2018 14:28:33 +0100 Subject: [PATCH] Change from wget to curl - So we don't have to install stuff Fix chown and remove archive --- apache/Dockerfile | 5 +++-- fpm/Dockerfile | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index 0ee6567..dbd8357 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -7,7 +7,8 @@ RUN docker-php-ext-install ldap \ && docker-php-ext-install zip \ # Download, unzip and chmod of LimeSurvey -RUN wget https://github.com/LimeSurvey/LimeSurvey/archive/3.0.2+180110.tar.gz -o lime.tar.gz && \ +RUN curl -L https://github.com/LimeSurvey/LimeSurvey/archive/3.0.2+180110.tar.gz -o lime.tar.gz && \ tar xzf lime.tar.gz && \ mv -t /var/www/html LimeSurvey*/* && \ - chmod -R /var/www/html + rm -rf LimeSurvey-* lime.tar.gz && \ + chown www-data:www-data -R /var/www/html diff --git a/fpm/Dockerfile b/fpm/Dockerfile index a771acf..2748586 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-apache +FROM php:7.2-fpm # Install PHP Plugins RUN docker-php-ext-install ldap \ @@ -7,7 +7,8 @@ RUN docker-php-ext-install ldap \ && docker-php-ext-install zip \ # Download, unzip and chmod of LimeSurvey -RUN wget https://github.com/LimeSurvey/LimeSurvey/archive/3.0.0+171222.tar.gz -o lime.tar.gz && \ +RUN curl -L https://github.com/LimeSurvey/LimeSurvey/archive/3.0.2+180110.tar.gz -o lime.tar.gz && \ tar xzf lime.tar.gz && \ mv -t /var/www/html LimeSurvey*/* && \ - chmod -R /var/www/html + rm -rf LimeSurvey-* lime.tar.gz && \ + chown www-data:www-data -R /var/www/html