[Helper] Nextcloud 13; Additional header for Nextcloud site
[PHP-FPM] Build gd with TTF supportmaster
parent
2284a35658
commit
fc53a69a44
|
@ -33,6 +33,12 @@ RUN apk add -U --no-cache libxml2-dev \
|
||||||
imagemagick-dev \
|
imagemagick-dev \
|
||||||
imagemagick \
|
imagemagick \
|
||||||
libtool \
|
libtool \
|
||||||
|
freetype \
|
||||||
|
libpng \
|
||||||
|
libjpeg-turbo \
|
||||||
|
freetype-dev \
|
||||||
|
libpng-dev \
|
||||||
|
libjpeg-turbo-dev\
|
||||||
gettext-dev \
|
gettext-dev \
|
||||||
openldap-dev \
|
openldap-dev \
|
||||||
librsvg \
|
librsvg \
|
||||||
|
@ -46,10 +52,33 @@ RUN apk add -U --no-cache libxml2-dev \
|
||||||
&& docker-php-ext-enable redis apcu memcached imagick mailparse \
|
&& docker-php-ext-enable redis apcu memcached imagick mailparse \
|
||||||
&& pecl clear-cache \
|
&& pecl clear-cache \
|
||||||
&& docker-php-ext-configure intl \
|
&& docker-php-ext-configure intl \
|
||||||
|
&& docker-php-ext-configure gd \
|
||||||
|
--with-gd \
|
||||||
|
--enable-gd-native-ttf \
|
||||||
|
--with-freetype-dir=/usr/include/ \
|
||||||
|
--with-png-dir=/usr/include/ \
|
||||||
|
--with-jpeg-dir=/usr/include/ \
|
||||||
&& docker-php-ext-install -j 4 intl gettext ldap sockets soap pdo pdo_mysql xmlrpc gd zip pcntl opcache \
|
&& docker-php-ext-install -j 4 intl gettext ldap sockets soap pdo pdo_mysql xmlrpc gd zip pcntl opcache \
|
||||||
&& docker-php-ext-configure imap --with-imap --with-imap-ssl \
|
&& docker-php-ext-configure imap --with-imap --with-imap-ssl \
|
||||||
&& docker-php-ext-install -j 4 imap \
|
&& docker-php-ext-install -j 4 imap \
|
||||||
&& apk del --purge autoconf g++ make libxml2-dev icu-dev imap-dev openssl-dev cyrus-sasl-dev pcre-dev libpng-dev libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev imagemagick-dev
|
&& apk del --purge autoconf \
|
||||||
|
g++ \
|
||||||
|
make \
|
||||||
|
libxml2-dev \
|
||||||
|
icu-dev \
|
||||||
|
imap-dev \
|
||||||
|
openssl-dev \
|
||||||
|
cyrus-sasl-dev \
|
||||||
|
pcre-dev \
|
||||||
|
libpng-dev \
|
||||||
|
libpng-dev \
|
||||||
|
libjpeg-turbo-dev \
|
||||||
|
libwebp-dev \
|
||||||
|
zlib-dev \
|
||||||
|
imagemagick-dev \
|
||||||
|
freetype-dev \
|
||||||
|
libpng-dev \
|
||||||
|
libjpeg-turbo-dev
|
||||||
|
|
||||||
COPY ./docker-entrypoint.sh /
|
COPY ./docker-entrypoint.sh /
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ server {
|
||||||
add_header X-Robots-Tag none;
|
add_header X-Robots-Tag none;
|
||||||
add_header X-Download-Options noopen;
|
add_header X-Download-Options noopen;
|
||||||
add_header X-Permitted-Cross-Domain-Policies none;
|
add_header X-Permitted-Cross-Domain-Policies none;
|
||||||
|
add_header X-Frame-Options "SAMEORIGIN";
|
||||||
|
|
||||||
server_name NC_SUBD;
|
server_name NC_SUBD;
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
add_header X-Robots-Tag none;
|
add_header X-Robots-Tag none;
|
||||||
add_header X-Download-Options noopen;
|
add_header X-Download-Options noopen;
|
||||||
add_header X-Permitted-Cross-Domain-Policies none;
|
add_header X-Permitted-Cross-Domain-Policies none;
|
||||||
|
add_header X-Frame-Options "SAMEORIGIN";
|
||||||
access_log off;
|
access_log off;
|
||||||
}
|
}
|
||||||
location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
|
location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
|
||||||
|
|
|
@ -102,7 +102,7 @@ services:
|
||||||
- rspamd
|
- rspamd
|
||||||
|
|
||||||
php-fpm-mailcow:
|
php-fpm-mailcow:
|
||||||
image: mailcow/phpfpm:1.11
|
image: mailcow/phpfpm:1.12
|
||||||
build: ./data/Dockerfiles/phpfpm
|
build: ./data/Dockerfiles/phpfpm
|
||||||
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
|
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
|
||||||
depends_on:
|
depends_on:
|
||||||
|
|
|
@ -64,7 +64,7 @@ elif [[ ${NC_INSTALL} == "y" ]]; then
|
||||||
|
|
||||||
ADMIN_NC_PASS=$(</dev/urandom tr -dc A-Za-z0-9 | head -c 28)
|
ADMIN_NC_PASS=$(</dev/urandom tr -dc A-Za-z0-9 | head -c 28)
|
||||||
|
|
||||||
curl -L# -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/latest-12.tar.bz2" || { echo "Failed to download Nextcloud archive."; exit 1; } \
|
curl -L# -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/latest-13.tar.bz2" || { echo "Failed to download Nextcloud archive."; exit 1; } \
|
||||||
&& tar -xjf nextcloud.tar.bz2 -C ./data/web/ \
|
&& tar -xjf nextcloud.tar.bz2 -C ./data/web/ \
|
||||||
&& rm nextcloud.tar.bz2 \
|
&& rm nextcloud.tar.bz2 \
|
||||||
&& rm -rf ./data/web/nextcloud/updater \
|
&& rm -rf ./data/web/nextcloud/updater \
|
||||||
|
|
Loading…
Reference in New Issue