diff --git a/config/nginx-sites.conf b/config/nginx-sites.conf index 63eea633a574eaffb47b3a083c327ef8e02711f2..f6784aa5d1a53c672412ae4e729d22e215fc8d15 100644 --- a/config/nginx-sites.conf +++ b/config/nginx-sites.conf @@ -45,6 +45,13 @@ location ^~ /5.4 { set $site_document_root /var/www/html/studip/5.4/public; include nginx-php.conf; } +location ^~ /5.5 { + alias /var/www/html/studip/5.5/public; + index index.php index.html index.html; + + set $site_document_root /var/www/html/studip/5.5/public; + include nginx-php.conf; +} location ^~ /uol-5.4 { alias /var/www/html/studip/uol/5.4/public; diff --git a/php/7.2-Dockerfile b/php/7.2-Dockerfile index 5221f9f4b394a609e87504b1b80740c7091788c2..0bb670ab0ffd1a5248530f5664952fe62192e7ef 100644 --- a/php/7.2-Dockerfile +++ b/php/7.2-Dockerfile @@ -4,6 +4,7 @@ FROM php:7.2-fpm RUN apt update && apt install -y --no-install-recommends \ default-mysql-client \ default-libmysqlclient-dev \ + imagemagick ghostscript \ libcurl4-openssl-dev zlib1g-dev \ libjpeg-dev \ libpng-dev \ @@ -30,3 +31,7 @@ RUN locale-gen de_DE.UTF-8 \ # Install Memcached & redis RUN pecl install memcached redis \ && docker-php-ext-enable memcached redis + +# Enable PS in gs +RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \ + /etc/ImageMagick-6/policy.xml diff --git a/php/7.3-Dockerfile b/php/7.3-Dockerfile index d3cebfd8db98b1ca6f867f9299a728f72847a60c..c6e13ff8780989478a570a907ec78fae92296955 100644 --- a/php/7.3-Dockerfile +++ b/php/7.3-Dockerfile @@ -4,6 +4,7 @@ FROM php:7.3-fpm RUN apt update && apt install -y --no-install-recommends \ default-mysql-client \ default-libmysqlclient-dev \ + imagemagick ghostscript \ libcurl4-openssl-dev zlib1g-dev \ libjpeg-dev \ libpng-dev \ @@ -30,3 +31,7 @@ RUN locale-gen de_DE.UTF-8 \ # Install Memcached RUN pecl install memcached redis \ && docker-php-ext-enable memcached redis + +# Enable PS in gs +RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \ + /etc/ImageMagick-6/policy.xml diff --git a/php/7.4-Dockerfile b/php/7.4-Dockerfile index 969639f8fb084c8ebe2ba4c3b93d7529a3d7ebff..4a74f8934bf5175d0dc38880aaec1122312a8279 100644 --- a/php/7.4-Dockerfile +++ b/php/7.4-Dockerfile @@ -4,6 +4,7 @@ FROM php:7.4-fpm RUN apt update && apt install -y --no-install-recommends \ default-mysql-client \ default-libmysqlclient-dev \ + imagemagick ghostscript \ libcurl4-openssl-dev zlib1g-dev \ libjpeg-dev \ libpng-dev \ @@ -30,3 +31,7 @@ RUN locale-gen de_DE.UTF-8 \ # Install Memcached & redis RUN pecl install memcached redis \ && docker-php-ext-enable memcached redis + +# Enable PS in gs +RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \ + /etc/ImageMagick-6/policy.xml diff --git a/php/8.0-Dockerfile b/php/8.0-Dockerfile index f3e1985f1bc5286eba4cc6d64f3692eed72b7a0d..2f795f203fc26dc2825218b817ba13828bcf7127 100644 --- a/php/8.0-Dockerfile +++ b/php/8.0-Dockerfile @@ -4,6 +4,7 @@ FROM php:8.0-fpm RUN apt update && apt install -y --no-install-recommends \ default-mysql-client \ default-libmysqlclient-dev \ + imagemagick ghostscript \ libcurl4-openssl-dev zlib1g-dev \ libjpeg-dev \ libpng-dev \ @@ -30,3 +31,7 @@ RUN locale-gen de_DE.UTF-8 \ # Install Memcached & redis RUN pecl install memcached redis \ && docker-php-ext-enable memcached redis + +# Enable PS in gs +RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \ + /etc/ImageMagick-6/policy.xml diff --git a/php/8.1-Dockerfile b/php/8.1-Dockerfile index 728de5640a90c968b1f0ede980323aa7947b5c83..3bd5c8e382c90d43255d0ae739b1d23854561db4 100644 --- a/php/8.1-Dockerfile +++ b/php/8.1-Dockerfile @@ -4,6 +4,7 @@ FROM php:8.1-fpm RUN apt update && apt install -y --no-install-recommends \ default-mysql-client \ default-libmysqlclient-dev \ + imagemagick ghostscript \ libcurl4-openssl-dev zlib1g-dev \ libjpeg-dev \ libpng-dev \ @@ -30,3 +31,7 @@ RUN locale-gen de_DE.UTF-8 \ # Install Memcached & redis RUN pecl install memcached redis \ && docker-php-ext-enable memcached redis + +# Enable PS in gs +RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \ + /etc/ImageMagick-6/policy.xml diff --git a/php/8.2-Dockerfile b/php/8.2-Dockerfile index 009ea675d46f59376f0387e0acd55e779a67a601..16639e43759ded3d1eca3253ba4f11be4102d3f4 100644 --- a/php/8.2-Dockerfile +++ b/php/8.2-Dockerfile @@ -4,6 +4,7 @@ FROM php:8.2-fpm RUN apt update && apt install -y --no-install-recommends \ default-mysql-client \ default-libmysqlclient-dev \ + imagemagick ghostscript \ libcurl4-openssl-dev zlib1g-dev \ libjpeg-dev \ libpng-dev \ @@ -30,3 +31,7 @@ RUN locale-gen de_DE.UTF-8 \ # Install Memcached & redis RUN pecl install memcached redis \ && docker-php-ext-enable memcached redis + +# Enable PS in gs +RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \ + /etc/ImageMagick-6/policy.xml diff --git a/php/8.3-Dockerfile b/php/8.3-Dockerfile index 465b488757443417ee53cd14e97e4f027606a433..56042356c5278a309996360bb6bf2d1849c97e19 100644 --- a/php/8.3-Dockerfile +++ b/php/8.3-Dockerfile @@ -5,6 +5,7 @@ RUN apt update \ && apt install -y --no-install-recommends \ default-mysql-client \ default-libmysqlclient-dev \ + imagemagick ghostscript \ libcurl4-openssl-dev zlib1g-dev \ libjpeg-dev \ libpng-dev \ @@ -31,3 +32,7 @@ RUN locale-gen de_DE.UTF-8 \ # Install Memcached and redis RUN pecl install memcached redis \ && docker-php-ext-enable memcached redis + +# Enable PS in gs +RUN sed -r -i_bak 's/rights="none" pattern="([EX]?PS[23]*|PDF)"/rights="read | write" pattern="\1"/' \ + /etc/ImageMagick-6/policy.xml