mirror of
https://github.com/linuxserver/docker-nextcloud.git
synced 2026-04-27 00:00:25 +08:00
adding new deps discovered while reviewing the official nextcloud container, updating the nginx conf to be in sync with v15
This commit is contained in:
thelamer
parent
508808420c
commit
39fd8e322b
@ -12,7 +12,7 @@ ENV NEXTCLOUD_PATH="/config/www/nextcloud"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
apk add --no-cache --virtual=build-dependencies --upgrade \
|
||||
autoconf \
|
||||
automake \
|
||||
file \
|
||||
@ -24,7 +24,7 @@ RUN \
|
||||
samba-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
apk add --no-cache --upgrade \
|
||||
curl \
|
||||
ffmpeg \
|
||||
imagemagick \
|
||||
@ -54,10 +54,11 @@ RUN \
|
||||
php7-phar \
|
||||
php7-posix \
|
||||
php7-redis \
|
||||
php7-sodium \
|
||||
php7-sqlite3 \
|
||||
php7-xmlreader \
|
||||
php7-zip \
|
||||
samba \
|
||||
samba-client \
|
||||
sudo \
|
||||
tar \
|
||||
unzip && \
|
||||
@ -71,6 +72,7 @@ RUN \
|
||||
make install && \
|
||||
echo "**** configure php and nginx for nextcloud ****" && \
|
||||
echo "extension="smbclient.so"" > /etc/php7/conf.d/00_smbclient.ini && \
|
||||
echo 'apc.enable_cli=1' >> /etc/php7/conf.d/apcu.ini && \
|
||||
sed -i \
|
||||
-e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
|
||||
-e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \
|
||||
|
||||
@ -15,7 +15,7 @@ ENV NEXTCLOUD_PATH="/config/www/nextcloud"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
apk add --no-cache --virtual=build-dependencies --upgrade \
|
||||
autoconf \
|
||||
automake \
|
||||
file \
|
||||
@ -27,7 +27,7 @@ RUN \
|
||||
samba-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
apk add --no-cache --upgrade \
|
||||
curl \
|
||||
ffmpeg \
|
||||
imagemagick \
|
||||
@ -57,10 +57,11 @@ RUN \
|
||||
php7-phar \
|
||||
php7-posix \
|
||||
php7-redis \
|
||||
php7-sodium \
|
||||
php7-sqlite3 \
|
||||
php7-xmlreader \
|
||||
php7-zip \
|
||||
samba \
|
||||
samba-client \
|
||||
sudo \
|
||||
tar \
|
||||
unzip && \
|
||||
@ -74,6 +75,7 @@ RUN \
|
||||
make install && \
|
||||
echo "**** configure php and nginx for nextcloud ****" && \
|
||||
echo "extension="smbclient.so"" > /etc/php7/conf.d/00_smbclient.ini && \
|
||||
echo 'apc.enable_cli=1' >> /etc/php7/conf.d/apcu.ini && \
|
||||
sed -i \
|
||||
-e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
|
||||
-e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \
|
||||
|
||||
@ -15,7 +15,7 @@ ENV NEXTCLOUD_PATH="/config/www/nextcloud"
|
||||
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
apk add --no-cache --virtual=build-dependencies --upgrade \
|
||||
autoconf \
|
||||
automake \
|
||||
file \
|
||||
@ -27,7 +27,7 @@ RUN \
|
||||
samba-dev \
|
||||
zlib-dev && \
|
||||
echo "**** install runtime packages ****" && \
|
||||
apk add --no-cache \
|
||||
apk add --no-cache --upgrade \
|
||||
curl \
|
||||
ffmpeg \
|
||||
imagemagick \
|
||||
@ -57,10 +57,11 @@ RUN \
|
||||
php7-phar \
|
||||
php7-posix \
|
||||
php7-redis \
|
||||
php7-sodium \
|
||||
php7-sqlite3 \
|
||||
php7-xmlreader \
|
||||
php7-zip \
|
||||
samba \
|
||||
samba-client \
|
||||
sudo \
|
||||
tar \
|
||||
unzip && \
|
||||
@ -74,6 +75,7 @@ RUN \
|
||||
make install && \
|
||||
echo "**** configure php and nginx for nextcloud ****" && \
|
||||
echo "extension="smbclient.so"" > /etc/php7/conf.d/00_smbclient.ini && \
|
||||
echo 'apc.enable_cli=1' >> /etc/php7/conf.d/apcu.ini && \
|
||||
sed -i \
|
||||
-e 's/;opcache.enable.*=.*/opcache.enable=1/g' \
|
||||
-e 's/;opcache.interned_strings_buffer.*=.*/opcache.interned_strings_buffer=8/g' \
|
||||
|
||||
@ -1,110 +1,84 @@
|
||||
upstream php-handler {
|
||||
server 127.0.0.1:9000;
|
||||
# server unix:/var/run/php/php7.0-fpm.sock;
|
||||
server 127.0.0.1:9000;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name _;
|
||||
# enforce https
|
||||
return 301 https://$server_name$request_uri;
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name _;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name _;
|
||||
|
||||
ssl_certificate /config/keys/cert.crt;
|
||||
ssl_certificate_key /config/keys/cert.key;
|
||||
|
||||
# Add headers to serve security related headers
|
||||
add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
|
||||
add_header X-Content-Type-Options nosniff;
|
||||
# add_header X-Frame-Options "SAMEORIGIN";
|
||||
add_header X-XSS-Protection "1; mode=block";
|
||||
add_header X-Robots-Tag none;
|
||||
add_header X-Download-Options noopen;
|
||||
add_header X-Permitted-Cross-Domain-Policies none;
|
||||
add_header Referrer-Policy no-referrer always;
|
||||
|
||||
# Path to the root of your installation
|
||||
root /config/www/nextcloud/;
|
||||
# set max upload size
|
||||
client_max_body_size 10G;
|
||||
fastcgi_buffers 64 4K;
|
||||
|
||||
# Disable gzip to avoid the removal of the ETag header
|
||||
gzip off;
|
||||
|
||||
# Uncomment if your server is build with the ngx_pagespeed module
|
||||
# This module is currently not supported.
|
||||
#pagespeed off;
|
||||
|
||||
index index.php;
|
||||
error_page 403 /core/templates/403.php;
|
||||
error_page 404 /core/templates/404.php;
|
||||
|
||||
rewrite ^/.well-known/carddav /remote.php/dav/ permanent;
|
||||
rewrite ^/.well-known/caldav /remote.php/dav/ permanent;
|
||||
|
||||
# The following 2 rules are only needed for the user_webfinger app.
|
||||
# Uncomment it if you're planning to use this app.
|
||||
#rewrite ^/.well-known/host-meta /public.php?service=host-meta last;
|
||||
#rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last;
|
||||
|
||||
location = /robots.txt {
|
||||
allow all;
|
||||
log_not_found off;
|
||||
access_log off;
|
||||
}
|
||||
|
||||
location ~ ^/(build|tests|config|lib|3rdparty|templates|data)/ {
|
||||
deny all;
|
||||
}
|
||||
|
||||
location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) {
|
||||
deny all;
|
||||
}
|
||||
|
||||
location / {
|
||||
|
||||
rewrite ^/remote/(.*) /remote.php last;
|
||||
|
||||
rewrite ^(/core/doc/[^\/]+/)$ $1/index.html;
|
||||
|
||||
try_files $uri $uri/ =404;
|
||||
}
|
||||
|
||||
location ~ \.php(?:$|/) {
|
||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
fastcgi_param HTTPS on;
|
||||
fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice
|
||||
fastcgi_pass php-handler;
|
||||
fastcgi_intercept_errors on;
|
||||
}
|
||||
|
||||
# Adding the cache control header for js and css files
|
||||
# Make sure it is BELOW the location ~ \.php(?:$|/) { block
|
||||
location ~* \.(?:css|js)$ {
|
||||
add_header Cache-Control "public, max-age=7200";
|
||||
# Add headers to serve security related headers
|
||||
add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;";
|
||||
listen 443 ssl http2;
|
||||
listen [::]:443 ssl http2;
|
||||
server_name _;
|
||||
ssl_certificate /config/keys/cert.crt;
|
||||
ssl_certificate_key /config/keys/cert.key;
|
||||
add_header X-Content-Type-Options nosniff;
|
||||
add_header X-Frame-Options "SAMEORIGIN";
|
||||
add_header X-XSS-Protection "1; mode=block";
|
||||
add_header X-Robots-Tag none;
|
||||
add_header X-Download-Options noopen;
|
||||
add_header X-Permitted-Cross-Domain-Policies none;
|
||||
add_header Referrer-Policy no-referrer always;
|
||||
# Optional: Don't log access to assets
|
||||
access_log off;
|
||||
}
|
||||
add_header Referrer-Policy no-referrer;
|
||||
fastcgi_hide_header X-Powered-By;
|
||||
root /config/www/nextcloud/;
|
||||
location = /robots.txt {
|
||||
allow all;
|
||||
log_not_found off;
|
||||
access_log off;
|
||||
}
|
||||
location = /.well-known/carddav {
|
||||
return 301 $scheme://$host/remote.php/dav;
|
||||
}
|
||||
location = /.well-known/caldav {
|
||||
return 301 $scheme://$host/remote.php/dav;
|
||||
}
|
||||
client_max_body_size 10G;
|
||||
fastcgi_buffers 64 4K;
|
||||
gzip on;
|
||||
gzip_vary on;
|
||||
gzip_comp_level 4;
|
||||
gzip_min_length 256;
|
||||
gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
|
||||
gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
|
||||
location / {
|
||||
rewrite ^ /index.php$request_uri;
|
||||
}
|
||||
location ~ ^\/(?:build|tests|config|lib|3rdparty|templates|data)\/ {
|
||||
deny all;
|
||||
}
|
||||
location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) {
|
||||
deny all;
|
||||
}
|
||||
location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|ocm-provider\/.+)\.php(?:$|\/) {
|
||||
fastcgi_split_path_info ^(.+?\.php)(\/.*|)$;
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||
fastcgi_param HTTPS on;
|
||||
fastcgi_param modHeadersAvailable true;
|
||||
fastcgi_param front_controller_active true;
|
||||
fastcgi_pass php-handler;
|
||||
fastcgi_intercept_errors on;
|
||||
fastcgi_request_buffering off;
|
||||
}
|
||||
|
||||
# Optional: Don't log access to other assets
|
||||
location ~* \.(?:jpg|jpeg|gif|bmp|ico|png|swf)$ {
|
||||
access_log off;
|
||||
}
|
||||
location ~ ^\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) {
|
||||
try_files $uri/ =404;
|
||||
index index.php;
|
||||
}
|
||||
location ~ \.(?:css|js|woff2?|svg|gif)$ {
|
||||
try_files $uri /index.php$request_uri;
|
||||
add_header Cache-Control "public, max-age=15778463";
|
||||
add_header X-Content-Type-Options nosniff;
|
||||
add_header X-XSS-Protection "1; mode=block";
|
||||
add_header X-Robots-Tag none;
|
||||
add_header X-Download-Options noopen;
|
||||
add_header X-Permitted-Cross-Domain-Policies none;
|
||||
add_header Referrer-Policy no-referrer;
|
||||
access_log off;
|
||||
}
|
||||
location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ {
|
||||
try_files $uri /index.php$request_uri;
|
||||
access_log off;
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,15 +6,16 @@ mkdir -p \
|
||||
|
||||
# install app
|
||||
if [ ! -e "${NEXTCLOUD_PATH}/index.php" ]; then
|
||||
NEXTCLOUD_VERSION=$(cat /version.txt)
|
||||
curl -o /tmp/nextcloud.tar.bz2 -L \
|
||||
https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2
|
||||
tar xf /tmp/nextcloud.tar.bz2 -C \
|
||||
"${NEXTCLOUD_PATH}" --strip-components=1
|
||||
rm -f \
|
||||
/tmp/nextcloud.tar.bz2
|
||||
chown abc:abc -R \
|
||||
"${NEXTCLOUD_PATH}"
|
||||
NEXTCLOUD_VERSION=$(cat /version.txt)
|
||||
curl -o /tmp/nextcloud.tar.bz2 -L \
|
||||
https://download.nextcloud.com/server/releases/nextcloud-${NEXTCLOUD_VERSION}.tar.bz2
|
||||
tar xf /tmp/nextcloud.tar.bz2 -C \
|
||||
"${NEXTCLOUD_PATH}" --strip-components=1
|
||||
rm -f \
|
||||
/tmp/nextcloud.tar.bz2
|
||||
chown abc:abc -R \
|
||||
"${NEXTCLOUD_PATH}"
|
||||
chmod +x "${NEXTCLOUD_PATH}/occ"
|
||||
fi
|
||||
|
||||
# set cronjob
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user