Compare commits

..

1 Commits

Author SHA1 Message Date
Markus Opolka
180eaf9c21 Upgrading to Version 4.3.31+201214 2020-12-21 15:07:16 +01:00
6 changed files with 20 additions and 48 deletions

View File

@@ -1,7 +1,7 @@
FROM php:7.4-apache FROM php:7.4-apache
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.25.18+210316' ARG version='3.25.4+201215'
ARG sha256_checksum='16c5b775ffe7cab778eb10ffe8723f45762e031ced4d254508a53f691dd9bd2d' ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -19,8 +19,6 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \ libzip-dev \
libtidy-dev \
libsodium-dev \
netcat \ netcat \
\ \
&& apt-get -y autoclean; apt-get -y autoremove; \ && apt-get -y autoclean; apt-get -y autoremove; \
@@ -32,7 +30,7 @@ RUN set -ex; \
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \ RUN set -ex; \
docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure gd && \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \ docker-php-ext-install -j5 \
exif \ exif \
@@ -44,8 +42,6 @@ RUN set -ex; \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
pgsql \ pgsql \
sodium \
tidy \
zip zip
ENV LIMESURVEY_VERSION=$version ENV LIMESURVEY_VERSION=$version
@@ -73,7 +69,7 @@ RUN set -ex; \
rm -f "/tmp/limesurvey.tar.gz" && \ rm -f "/tmp/limesurvey.tar.gz" && \
chown -R www-data:www-data /var/www/html chown -R www-data:www-data /var/www/html
WORKDIR /var/www/html
COPY entrypoint.sh entrypoint.sh COPY entrypoint.sh entrypoint.sh
ENTRYPOINT ["/var/www/html/entrypoint.sh"] ENTRYPOINT ["/var/www/html/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm-alpine FROM php:7.4-fpm-alpine
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.25.18+210316' ARG version='3.25.4+201215'
ARG sha256_checksum='16c5b775ffe7cab778eb10ffe8723f45762e031ced4d254508a53f691dd9bd2d' ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -10,8 +10,6 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libzip-dev \ libzip-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
tidyhtml-dev \
libsodium-dev \
openldap-dev \ openldap-dev \
oniguruma-dev \ oniguruma-dev \
imap-dev \ imap-dev \
@@ -20,7 +18,7 @@ RUN set -ex; \
# Install PHP Plugins # Install PHP Plugins
RUN set -ex; \ RUN set -ex; \
docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure gd && \
docker-php-ext-configure imap --with-imap-ssl && \ docker-php-ext-configure imap --with-imap-ssl && \
docker-php-ext-install \ docker-php-ext-install \
gd \ gd \
@@ -31,8 +29,6 @@ RUN set -ex; \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
pgsql \ pgsql \
sodium \
tidy \
zip zip
# Download, unzip and chmod of LimeSurvey # Download, unzip and chmod of LimeSurvey
@@ -52,7 +48,6 @@ RUN set -ex; \
EXPOSE 9000 EXPOSE 9000
WORKDIR /var/www/html
COPY entrypoint.sh entrypoint.sh COPY entrypoint.sh entrypoint.sh
ENTRYPOINT ["/var/www/html/entrypoint.sh"] ENTRYPOINT ["/var/www/html/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm FROM php:7.4-fpm
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='3.25.18+210316' ARG version='3.25.4+201215'
ARG sha256_checksum='16c5b775ffe7cab778eb10ffe8723f45762e031ced4d254508a53f691dd9bd2d' ARG sha256_checksum='6b19e10103376a7e3a416bdd07d09f32195ea989229bdb42c32e7f5dd1c5ddde'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -19,8 +19,6 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \ libzip-dev \
libtidy-dev \
libsodium-dev \
netcat \ netcat \
\ \
&& apt-get -y autoclean; apt-get -y autoremove; \ && apt-get -y autoclean; apt-get -y autoremove; \
@@ -32,7 +30,7 @@ RUN set -ex; \
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \ RUN set -ex; \
docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure gd && \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \ docker-php-ext-install -j5 \
exif \ exif \
@@ -44,8 +42,6 @@ RUN set -ex; \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
pgsql \ pgsql \
sodium \
tidy \
zip zip
ENV LIMESURVEY_VERSION=$version ENV LIMESURVEY_VERSION=$version
@@ -62,7 +58,6 @@ RUN set -ex; \
EXPOSE 9000 EXPOSE 9000
WORKDIR /var/www/html
COPY entrypoint.sh entrypoint.sh COPY entrypoint.sh entrypoint.sh
ENTRYPOINT ["/var/www/html/entrypoint.sh"] ENTRYPOINT ["/var/www/html/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

View File

@@ -1,7 +1,7 @@
FROM php:7.4-apache FROM php:7.4-apache
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.4.13+210315' ARG version='4.3.31+201214'
ARG sha256_checksum='f6a6af245aa4a318c7fca66a1db76add3580cd0cb56e0c4a5b1516600f214152' ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -19,8 +19,6 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \ libzip-dev \
libtidy-dev \
libsodium-dev \
netcat \ netcat \
curl \ curl \
\ \
@@ -33,7 +31,7 @@ RUN set -ex; \
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \ RUN set -ex; \
docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure gd && \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \ docker-php-ext-install -j5 \
exif \ exif \
@@ -45,8 +43,6 @@ RUN set -ex; \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
pgsql \ pgsql \
sodium \
tidy \
zip zip
ENV LIMESURVEY_VERSION=$version ENV LIMESURVEY_VERSION=$version
@@ -74,7 +70,7 @@ RUN set -ex; \
rm -f "/tmp/limesurvey.tar.gz" && \ rm -f "/tmp/limesurvey.tar.gz" && \
chown -R www-data:www-data /var/www/html chown -R www-data:www-data /var/www/html
WORKDIR /var/www/html
COPY entrypoint.sh entrypoint.sh COPY entrypoint.sh entrypoint.sh
ENTRYPOINT ["/var/www/html/entrypoint.sh"] ENTRYPOINT ["/var/www/html/entrypoint.sh"]
CMD ["apache2-foreground"] CMD ["apache2-foreground"]

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm-alpine FROM php:7.4-fpm-alpine
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.4.13+210315' ARG version='4.3.31+201214'
ARG sha256_checksum='f6a6af245aa4a318c7fca66a1db76add3580cd0cb56e0c4a5b1516600f214152' ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -10,8 +10,6 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libzip-dev \ libzip-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
tidyhtml-dev \
libsodium-dev \
openldap-dev \ openldap-dev \
oniguruma-dev \ oniguruma-dev \
imap-dev \ imap-dev \
@@ -20,7 +18,7 @@ RUN set -ex; \
# Install PHP Plugins # Install PHP Plugins
RUN set -ex; \ RUN set -ex; \
docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure gd && \
docker-php-ext-configure imap --with-imap-ssl && \ docker-php-ext-configure imap --with-imap-ssl && \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \
@@ -32,8 +30,6 @@ RUN set -ex; \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
pgsql \ pgsql \
sodium \
tidy \
zip zip
# Download, unzip and chmod of LimeSurvey # Download, unzip and chmod of LimeSurvey
@@ -53,7 +49,6 @@ RUN set -ex; \
EXPOSE 9000 EXPOSE 9000
WORKDIR /var/www/html
COPY entrypoint.sh entrypoint.sh COPY entrypoint.sh entrypoint.sh
ENTRYPOINT ["/var/www/html/entrypoint.sh"] ENTRYPOINT ["/var/www/html/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]

View File

@@ -1,7 +1,7 @@
FROM php:7.4-fpm FROM php:7.4-fpm
LABEL maintainer="markus@martialblog.de" LABEL maintainer="markus@martialblog.de"
ARG version='4.4.13+210315' ARG version='4.3.31+201214'
ARG sha256_checksum='f6a6af245aa4a318c7fca66a1db76add3580cd0cb56e0c4a5b1516600f214152' ARG sha256_checksum='d237c6a799fbb73bdbca1b11f233a640f2a5aa4d62043cc7b809de31e1bda604'
# Install OS dependencies # Install OS dependencies
RUN set -ex; \ RUN set -ex; \
@@ -19,8 +19,6 @@ RUN set -ex; \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \ libzip-dev \
libtidy-dev \
libsodium-dev \
netcat \ netcat \
\ \
&& apt-get -y autoclean; apt-get -y autoremove; \ && apt-get -y autoclean; apt-get -y autoremove; \
@@ -32,7 +30,7 @@ RUN set -ex; \
# Install PHP Plugins and Configure PHP imap plugin # Install PHP Plugins and Configure PHP imap plugin
RUN set -ex; \ RUN set -ex; \
docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr && \ docker-php-ext-configure gd && \
docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
docker-php-ext-install -j5 \ docker-php-ext-install -j5 \
exif \ exif \
@@ -44,8 +42,6 @@ RUN set -ex; \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
pgsql \ pgsql \
sodium \
tidy \
zip zip
ENV LIMESURVEY_VERSION=$version ENV LIMESURVEY_VERSION=$version
@@ -62,7 +58,6 @@ RUN set -ex; \
EXPOSE 9000 EXPOSE 9000
WORKDIR /var/www/html
COPY entrypoint.sh entrypoint.sh COPY entrypoint.sh entrypoint.sh
ENTRYPOINT ["/var/www/html/entrypoint.sh"] ENTRYPOINT ["/var/www/html/entrypoint.sh"]
CMD ["php-fpm"] CMD ["php-fpm"]