From 49ea51c28cb7f1f4a5f3037879473815bcd08a94 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms <tleilax+github@gmail.com> Date: Wed, 3 Apr 2024 15:02:34 +0200 Subject: [PATCH] adjustments --- config/nginx-sites.conf | 7 +++++++ php/7.2-Dockerfile | 5 +++++ php/7.3-Dockerfile | 5 +++++ php/7.4-Dockerfile | 5 +++++ php/8.0-Dockerfile | 5 +++++ php/8.1-Dockerfile | 5 +++++ php/8.2-Dockerfile | 5 +++++ php/8.3-Dockerfile | 5 +++++ 8 files changed, 42 insertions(+) diff --git a/config/nginx-sites.conf b/config/nginx-sites.conf index 63eea63..f6784aa 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 5221f9f..0bb670a 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 d3cebfd..c6e13ff 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 969639f..4a74f89 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 f3e1985..2f795f2 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 728de56..3bd5c8e 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 009ea67..16639e4 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 465b488..5604235 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 -- GitLab