From 7da025f19add54e31f957c719f20853b4947615b Mon Sep 17 00:00:00 2001 From: Markus Opolka Date: Sun, 21 Mar 2021 11:15:29 +0100 Subject: [PATCH] Fix gd installation and add tidy/sodium lib --- 3.0/apache/Dockerfile | 8 ++++++-- 3.0/fpm-alpine/Dockerfile | 7 ++++++- 3.0/fpm/Dockerfile | 7 ++++++- 4.0/apache/Dockerfile | 8 ++++++-- 4.0/fpm-alpine/Dockerfile | 7 ++++++- 4.0/fpm/Dockerfile | 7 ++++++- 6 files changed, 36 insertions(+), 8 deletions(-) diff --git a/3.0/apache/Dockerfile b/3.0/apache/Dockerfile index e587f9f..0059d21 100644 --- a/3.0/apache/Dockerfile +++ b/3.0/apache/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ libpng-dev \ libpq-dev \ libzip-dev \ + libtidy-dev \ + libsodium-dev \ netcat \ \ && apt-get -y autoclean; apt-get -y autoremove; \ @@ -30,7 +32,7 @@ RUN set -ex; \ # Install PHP Plugins and Configure PHP imap plugin RUN set -ex; \ - docker-php-ext-configure gd && \ + docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-install -j5 \ exif \ @@ -42,6 +44,8 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ pgsql \ + sodium \ + tidy \ zip ENV LIMESURVEY_VERSION=$version @@ -69,7 +73,7 @@ RUN set -ex; \ rm -f "/tmp/limesurvey.tar.gz" && \ chown -R www-data:www-data /var/www/html +WORKDIR /var/www/html COPY entrypoint.sh entrypoint.sh - ENTRYPOINT ["/var/www/html/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/3.0/fpm-alpine/Dockerfile b/3.0/fpm-alpine/Dockerfile index 486baca..0902be5 100644 --- a/3.0/fpm-alpine/Dockerfile +++ b/3.0/fpm-alpine/Dockerfile @@ -10,6 +10,8 @@ RUN set -ex; \ libpng-dev \ libzip-dev \ libjpeg-turbo-dev \ + tidyhtml-dev \ + libsodium-dev \ openldap-dev \ oniguruma-dev \ imap-dev \ @@ -18,7 +20,7 @@ RUN set -ex; \ # Install PHP Plugins RUN set -ex; \ - docker-php-ext-configure gd && \ + docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure imap --with-imap-ssl && \ docker-php-ext-install \ gd \ @@ -29,6 +31,8 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ pgsql \ + sodium \ + tidy \ zip # Download, unzip and chmod of LimeSurvey @@ -48,6 +52,7 @@ RUN set -ex; \ EXPOSE 9000 +WORKDIR /var/www/html COPY entrypoint.sh entrypoint.sh ENTRYPOINT ["/var/www/html/entrypoint.sh"] CMD ["php-fpm"] diff --git a/3.0/fpm/Dockerfile b/3.0/fpm/Dockerfile index 6765e17..abceaa9 100644 --- a/3.0/fpm/Dockerfile +++ b/3.0/fpm/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ libpng-dev \ libpq-dev \ libzip-dev \ + libtidy-dev \ + libsodium-dev \ netcat \ \ && apt-get -y autoclean; apt-get -y autoremove; \ @@ -30,7 +32,7 @@ RUN set -ex; \ # Install PHP Plugins and Configure PHP imap plugin RUN set -ex; \ - docker-php-ext-configure gd && \ + docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-install -j5 \ exif \ @@ -42,6 +44,8 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ pgsql \ + sodium \ + tidy \ zip ENV LIMESURVEY_VERSION=$version @@ -58,6 +62,7 @@ RUN set -ex; \ EXPOSE 9000 +WORKDIR /var/www/html COPY entrypoint.sh entrypoint.sh ENTRYPOINT ["/var/www/html/entrypoint.sh"] CMD ["php-fpm"] diff --git a/4.0/apache/Dockerfile b/4.0/apache/Dockerfile index 51f5146..606902a 100644 --- a/4.0/apache/Dockerfile +++ b/4.0/apache/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ libpng-dev \ libpq-dev \ libzip-dev \ + libtidy-dev \ + libsodium-dev \ netcat \ curl \ \ @@ -31,7 +33,7 @@ RUN set -ex; \ # Install PHP Plugins and Configure PHP imap plugin RUN set -ex; \ - docker-php-ext-configure gd && \ + docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-install -j5 \ exif \ @@ -43,6 +45,8 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ pgsql \ + sodium \ + tidy \ zip ENV LIMESURVEY_VERSION=$version @@ -70,7 +74,7 @@ RUN set -ex; \ rm -f "/tmp/limesurvey.tar.gz" && \ chown -R www-data:www-data /var/www/html +WORKDIR /var/www/html COPY entrypoint.sh entrypoint.sh - ENTRYPOINT ["/var/www/html/entrypoint.sh"] CMD ["apache2-foreground"] diff --git a/4.0/fpm-alpine/Dockerfile b/4.0/fpm-alpine/Dockerfile index d65dddd..408dca7 100644 --- a/4.0/fpm-alpine/Dockerfile +++ b/4.0/fpm-alpine/Dockerfile @@ -10,6 +10,8 @@ RUN set -ex; \ libpng-dev \ libzip-dev \ libjpeg-turbo-dev \ + tidyhtml-dev \ + libsodium-dev \ openldap-dev \ oniguruma-dev \ imap-dev \ @@ -18,7 +20,7 @@ RUN set -ex; \ # Install PHP Plugins RUN set -ex; \ - docker-php-ext-configure gd && \ + docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure imap --with-imap-ssl && \ docker-php-ext-install \ exif \ @@ -30,6 +32,8 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ pgsql \ + sodium \ + tidy \ zip # Download, unzip and chmod of LimeSurvey @@ -49,6 +53,7 @@ RUN set -ex; \ EXPOSE 9000 +WORKDIR /var/www/html COPY entrypoint.sh entrypoint.sh ENTRYPOINT ["/var/www/html/entrypoint.sh"] CMD ["php-fpm"] diff --git a/4.0/fpm/Dockerfile b/4.0/fpm/Dockerfile index f4d6521..7a5b996 100644 --- a/4.0/fpm/Dockerfile +++ b/4.0/fpm/Dockerfile @@ -19,6 +19,8 @@ RUN set -ex; \ libpng-dev \ libpq-dev \ libzip-dev \ + libtidy-dev \ + libsodium-dev \ netcat \ \ && apt-get -y autoclean; apt-get -y autoremove; \ @@ -30,7 +32,7 @@ RUN set -ex; \ # Install PHP Plugins and Configure PHP imap plugin RUN set -ex; \ - docker-php-ext-configure gd && \ + docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-install -j5 \ exif \ @@ -42,6 +44,8 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ pgsql \ + sodium \ + tidy \ zip ENV LIMESURVEY_VERSION=$version @@ -58,6 +62,7 @@ RUN set -ex; \ EXPOSE 9000 +WORKDIR /var/www/html COPY entrypoint.sh entrypoint.sh ENTRYPOINT ["/var/www/html/entrypoint.sh"] CMD ["php-fpm"]