mirror of
https://github.com/hoellen/docker-nextcloud.git
synced 2026-06-01 22:10:44 +00:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 266855c572 | |||
| ddc63fa70e | |||
| 208ed68fc3 | |||
| fe44206881 | |||
| 6f10e62a16 | |||
| d8fde6dc0a | |||
| adf43bb5bf | |||
| 7422210f7c | |||
| 0221fa4f33 |
+16
-36
@@ -3,12 +3,10 @@ name: build
|
|||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches: [ version-27 ]
|
||||||
- master
|
|
||||||
- version-*
|
|
||||||
schedule:
|
schedule:
|
||||||
# Build the image regularly (each Friday)
|
# Build the image regularly (each Friday)
|
||||||
- cron: "23 04 * * 5"
|
- cron: '23 04 * * 5'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: ghcr.io
|
REGISTRY: ghcr.io
|
||||||
@@ -25,26 +23,25 @@ jobs:
|
|||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Extract version for tags
|
- name: Extract version for tags
|
||||||
run: |
|
run: |
|
||||||
BRANCH="${GITHUB_REF#refs/heads/}"
|
echo "FULL_VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c6)" >> $GITHUB_ENV
|
||||||
VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile)
|
echo "MAJOR_VERSION=$(grep -oP '(?<=NEXTCLOUD_VERSION=).*' Dockerfile | head -c2)" >> $GITHUB_ENV
|
||||||
[ "$BRANCH" = "master" ] && echo "BRANCH_VERSION=latest" >> $GITHUB_ENV
|
|
||||||
echo "FULL_VERSION=${VERSION:0:7}" >> $GITHUB_ENV
|
|
||||||
echo "MAJOR_VERSION=${VERSION:0:2}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Install cosign
|
- name: Install cosign
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
uses: sigstore/cosign-installer@v4.1.1
|
uses: sigstore/cosign-installer@main
|
||||||
|
with:
|
||||||
|
cosign-release: 'v2.2.2'
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v4
|
uses: docker/setup-buildx-action@v1
|
||||||
|
|
||||||
- name: Login to registry
|
- name: Login to registry
|
||||||
if: github.event_name != 'pull_request'
|
if: github.event_name != 'pull_request'
|
||||||
uses: docker/login-action@v4
|
uses: docker/login-action@v1
|
||||||
with:
|
with:
|
||||||
registry: ${{ env.REGISTRY }}
|
registry: ${{ env.REGISTRY }}
|
||||||
username: ${{ github.repository_owner }}
|
username: ${{ github.repository_owner }}
|
||||||
@@ -52,36 +49,19 @@ jobs:
|
|||||||
|
|
||||||
- name: Set Docker metadata
|
- name: Set Docker metadata
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v6
|
uses: docker/metadata-action@v3
|
||||||
with:
|
with:
|
||||||
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
|
||||||
tags: |
|
tags: |
|
||||||
${{ env.BRANCH_VERSION }}
|
|
||||||
${{ env.FULL_VERSION }}
|
${{ env.FULL_VERSION }}
|
||||||
${{ env.MAJOR_VERSION }}
|
${{ env.MAJOR_VERSION }}
|
||||||
|
|
||||||
- name: Build and export Docker image to Docker
|
- name: Build and push Docker image
|
||||||
id: build
|
id: build-and-push
|
||||||
uses: docker/build-push-action@v7
|
uses: docker/build-push-action@v2
|
||||||
with:
|
|
||||||
load: true
|
|
||||||
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:testing
|
|
||||||
context: .
|
|
||||||
|
|
||||||
- name: Test Docker image
|
|
||||||
id: test
|
|
||||||
run: |
|
|
||||||
docker run -d -p 8888:8888 --name nextcloud --rm ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:testing && \
|
|
||||||
sleep 5 && docker exec nextcloud occ status && \
|
|
||||||
nc -z localhost 8888
|
|
||||||
|
|
||||||
- name: Push Docker image
|
|
||||||
id: push
|
|
||||||
if: github.event_name != 'pull_request'
|
|
||||||
uses: docker/build-push-action@v7
|
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: ${{ github.event_name != 'pull_request' }}
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
|
||||||
@@ -89,4 +69,4 @@ jobs:
|
|||||||
if: ${{ github.event_name != 'pull_request' }}
|
if: ${{ github.event_name != 'pull_request' }}
|
||||||
env:
|
env:
|
||||||
COSIGN_EXPERIMENTAL: "true"
|
COSIGN_EXPERIMENTAL: "true"
|
||||||
run: cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.push.outputs.digest }}
|
run: cosign sign --yes ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
|
||||||
|
|||||||
+11
-11
@@ -3,27 +3,27 @@ name: scan
|
|||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
# Scan the image regularly (once a day)
|
# Scan the image regularly (once a day)
|
||||||
- cron: "45 03 * * *"
|
- cron: '45 03 * * *'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
name: Scan current image & report results
|
name: Scan current image & report results
|
||||||
runs-on: "ubuntu-24.04"
|
runs-on: "ubuntu-20.04"
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v2
|
||||||
|
|
||||||
- name: Run Trivy vulnerability scanner
|
- name: Run Trivy vulnerability scanner
|
||||||
uses: aquasecurity/trivy-action@v0.36.0
|
uses: aquasecurity/trivy-action@master
|
||||||
with:
|
with:
|
||||||
image-ref: "ghcr.io/${{ github.actor }}/nextcloud"
|
image-ref: 'ghcr.io/${{ github.actor }}/nextcloud'
|
||||||
format: "template"
|
format: 'template'
|
||||||
template: "@/contrib/sarif.tpl"
|
template: '@/contrib/sarif.tpl'
|
||||||
output: "trivy-results.sarif"
|
output: 'trivy-results.sarif'
|
||||||
severity: "CRITICAL,HIGH"
|
severity: 'CRITICAL,HIGH'
|
||||||
vuln-type: "os"
|
vuln-type: "os"
|
||||||
|
|
||||||
- name: Upload Trivy scan results to GitHub Security tab
|
- name: Upload Trivy scan results to GitHub Security tab
|
||||||
uses: github/codeql-action/upload-sarif@v3
|
uses: github/codeql-action/upload-sarif@v1
|
||||||
with:
|
with:
|
||||||
sarif_file: "trivy-results.sarif"
|
sarif_file: 'trivy-results.sarif'
|
||||||
|
|||||||
+16
-19
@@ -1,24 +1,24 @@
|
|||||||
# -------------- Build-time variables --------------
|
# -------------- Build-time variables --------------
|
||||||
ARG NEXTCLOUD_VERSION=33.0.3
|
ARG NEXTCLOUD_VERSION=27.1.11
|
||||||
ARG PHP_VERSION=8.4
|
ARG PHP_VERSION=8.2
|
||||||
ARG NGINX_VERSION=1.28
|
ARG NGINX_VERSION=1.24
|
||||||
|
|
||||||
ARG ALPINE_VERSION=3.23
|
ARG ALPINE_VERSION=3.18
|
||||||
ARG HARDENED_MALLOC_VERSION=14
|
ARG HARDENED_MALLOC_VERSION=11
|
||||||
ARG SNUFFLEUPAGUS_VERSION=0.13.0
|
ARG SNUFFLEUPAGUS_VERSION=0.10.0
|
||||||
|
|
||||||
ARG UID=1000
|
ARG UID=1000
|
||||||
ARG GID=1000
|
ARG GID=1000
|
||||||
|
|
||||||
# nextcloud-33.0.3.tar.bz2
|
# nextcloud-27.1.11.tar.bz2
|
||||||
ARG SHA256_SUM="5c1052f860b35aa56b24bc2613a6bea0c22313b9fbd02bb0247c1f0b9dbf77d2"
|
ARG SHA256_SUM="4edd2570f4c83442f8f0f0616fb774ed2663b11cf9f6ea49e795ab43aeef9645"
|
||||||
|
|
||||||
# Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
|
# Nextcloud Security <security@nextcloud.com> (D75899B9A724937A)
|
||||||
ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"
|
ARG GPG_FINGERPRINT="2880 6A87 8AE4 23A2 8372 792E D758 99B9 A724 937A"
|
||||||
# ---------------------------------------------------
|
# ---------------------------------------------------
|
||||||
|
|
||||||
### Build PHP base
|
### Build PHP base
|
||||||
FROM docker.io/library/php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} AS base
|
FROM php:${PHP_VERSION}-fpm-alpine${ALPINE_VERSION} as base
|
||||||
|
|
||||||
ARG SNUFFLEUPAGUS_VERSION
|
ARG SNUFFLEUPAGUS_VERSION
|
||||||
|
|
||||||
@@ -43,7 +43,6 @@ RUN apk -U upgrade \
|
|||||||
gmp \
|
gmp \
|
||||||
icu \
|
icu \
|
||||||
libjpeg-turbo \
|
libjpeg-turbo \
|
||||||
librsvg \
|
|
||||||
libpq \
|
libpq \
|
||||||
libpq \
|
libpq \
|
||||||
libwebp \
|
libwebp \
|
||||||
@@ -59,7 +58,6 @@ RUN apk -U upgrade \
|
|||||||
bcmath \
|
bcmath \
|
||||||
exif \
|
exif \
|
||||||
gd \
|
gd \
|
||||||
bz2 \
|
|
||||||
intl \
|
intl \
|
||||||
ldap \
|
ldap \
|
||||||
opcache \
|
opcache \
|
||||||
@@ -85,26 +83,25 @@ RUN apk -U upgrade \
|
|||||||
|
|
||||||
### Build Hardened Malloc
|
### Build Hardened Malloc
|
||||||
ARG ALPINE_VERSION
|
ARG ALPINE_VERSION
|
||||||
FROM docker.io/library/alpine:${ALPINE_VERSION} AS build-malloc
|
FROM alpine:${ALPINE_VERSION} as build-malloc
|
||||||
|
|
||||||
ARG HARDENED_MALLOC_VERSION
|
ARG HARDENED_MALLOC_VERSION
|
||||||
ARG CONFIG_NATIVE=false
|
ARG CONFIG_NATIVE=false
|
||||||
ARG VARIANT=light
|
ARG VARIANT=light
|
||||||
|
|
||||||
RUN apk --no-cache add build-base git openssh && cd /tmp \
|
RUN apk --no-cache add build-base git gnupg && cd /tmp \
|
||||||
&& wget -q -O - https://github.com/thestinger.keys | while read -r key; do echo "thestinger@github.com $key"; done > allowed_signers \
|
&& wget -q https://github.com/thestinger.gpg && gpg --import thestinger.gpg \
|
||||||
&& git config --global gpg.ssh.allowedSignersFile /tmp/allowed_signers && git init hardened_malloc && cd hardened_malloc \
|
&& git clone --depth 1 --branch ${HARDENED_MALLOC_VERSION} https://github.com/GrapheneOS/hardened_malloc \
|
||||||
&& git fetch --depth 1 https://github.com/GrapheneOS/hardened_malloc tag ${HARDENED_MALLOC_VERSION} \
|
&& cd hardened_malloc && git verify-tag $(git describe --tags) \
|
||||||
&& git checkout FETCH_HEAD && git verify-tag $(git describe --tags) \
|
|
||||||
&& make CONFIG_NATIVE=${CONFIG_NATIVE} VARIANT=${VARIANT}
|
&& make CONFIG_NATIVE=${CONFIG_NATIVE} VARIANT=${VARIANT}
|
||||||
|
|
||||||
|
|
||||||
### Fetch nginx
|
### Fetch nginx
|
||||||
FROM docker.io/library/nginx:${NGINX_VERSION}-alpine${ALPINE_VERSION} AS nginx
|
FROM nginx:${NGINX_VERSION}-alpine as nginx
|
||||||
|
|
||||||
|
|
||||||
### Build Nextcloud (production environemnt)
|
### Build Nextcloud (production environemnt)
|
||||||
FROM base AS nextcloud
|
FROM base as nextcloud
|
||||||
|
|
||||||
COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
|
COPY --from=nginx /usr/sbin/nginx /usr/sbin/nginx
|
||||||
COPY --from=nginx /etc/nginx /etc/nginx
|
COPY --from=nginx /etc/nginx /etc/nginx
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ ___
|
|||||||
- Includes **Snuffleupagus**, [a PHP security module](https://github.com/jvoisin/snuffleupagus).
|
- Includes **Snuffleupagus**, [a PHP security module](https://github.com/jvoisin/snuffleupagus).
|
||||||
- Includes a simple **built-in cron** system.
|
- Includes a simple **built-in cron** system.
|
||||||
- Much easier to maintain thanks to multi-stages build.
|
- Much easier to maintain thanks to multi-stages build.
|
||||||
- Includes imagick and smbclient for extended file handling and SMB/CIFS support.
|
- Does not include imagick, samba, etc. by default.
|
||||||
|
|
||||||
You're free to make your own image based on this one if you want a specific feature. Uncommon features won't be included as they can increase attack surface: this image intends to stay **minimal**, but **functional enough** to cover basic needs.
|
You're free to make your own image based on this one if you want a specific feature. Uncommon features won't be included as they can increase attack surface: this image intends to stay **minimal**, but **functional enough** to cover basic needs.
|
||||||
|
|
||||||
@@ -58,8 +58,8 @@ Verifying the signature isn't a requirement, and might not be as seamless as usi
|
|||||||
## Tags
|
## Tags
|
||||||
|
|
||||||
- `latest` : latest Nextcloud version
|
- `latest` : latest Nextcloud version
|
||||||
- `x` : latest Nextcloud x.x (e.g. `33`)
|
- `x` : latest Nextcloud x.x (e.g. `25`)
|
||||||
- `x.x.x` : Nextcloud x.x.x (e.g. `33.0.0`)
|
- `x.x.x` : Nextcloud x.x.x (e.g. `25.0.0`)
|
||||||
|
|
||||||
You can always have a glance [here](https://github.com/users/hoellen/packages/container/package/nextcloud).
|
You can always have a glance [here](https://github.com/users/hoellen/packages/container/package/nextcloud).
|
||||||
Only the **latest stable version** will be maintained by myself.
|
Only the **latest stable version** will be maintained by myself.
|
||||||
|
|||||||
+6
-16
@@ -2,26 +2,17 @@
|
|||||||
|
|
||||||
## Supported versions
|
## Supported versions
|
||||||
|
|
||||||
All versions of the Nextcloud community version which still receive updates will be supported
|
All versions of the Nextcloud community version which still receive updates will be supported
|
||||||
and will receive the minor version updates and security patches.
|
and will receive the minor version updates and security patches.
|
||||||
|
|
||||||
| Version | Supported |
|
| Version | Supported |
|
||||||
| ------- | ----------------------------- |
|
| ------- | ------------------ |
|
||||||
| 33. x | :white_check_mark: |
|
| 25. x | :white_check_mark: |
|
||||||
| 32. x | :white_check_mark: |
|
| 24. x | :white_check_mark: |
|
||||||
| 31. x | :negative_squared_cross_mark: |
|
|
||||||
| 30. x | :negative_squared_cross_mark: |
|
|
||||||
| 29. x | :negative_squared_cross_mark: |
|
|
||||||
| 28. x | :negative_squared_cross_mark: |
|
|
||||||
| 27. x | :negative_squared_cross_mark: |
|
|
||||||
| 26. x | :negative_squared_cross_mark: |
|
|
||||||
| 25. x | :negative_squared_cross_mark: |
|
|
||||||
| 24. x | :negative_squared_cross_mark: |
|
|
||||||
| 23. x | :negative_squared_cross_mark: |
|
| 23. x | :negative_squared_cross_mark: |
|
||||||
| 22. x | :negative_squared_cross_mark: |
|
| 22. x | :negative_squared_cross_mark: |
|
||||||
|
|
||||||
Please update to the latest version available. Major migrations are always tested before being pushed.
|
Please update to the latest version available. Major migrations are always tested before being pushed.
|
||||||
An up-to-date list of the currently maintained Nextcloud versions can also be found in the [Nextcloud Repository Wiki](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule).
|
|
||||||
|
|
||||||
## Automated vulnerability scanning
|
## Automated vulnerability scanning
|
||||||
|
|
||||||
@@ -29,10 +20,9 @@ Uploaded images are regularly scanned for [OS vulnerabilities](https://github.co
|
|||||||
|
|
||||||
## Reporting a vulnerability
|
## Reporting a vulnerability
|
||||||
|
|
||||||
_Upstream_ vulnerabilities should be reported to _upstream_ projects according to their own security policies.
|
*Upstream* vulnerabilities should be reported to *upstream* projects according to their own security policies.
|
||||||
|
|
||||||
Regarding vulnerabilities specific to this project:
|
Regarding vulnerabilities specific to this project:
|
||||||
|
|
||||||
- Faulty configuration files
|
- Faulty configuration files
|
||||||
- Unsafe defaults
|
- Unsafe defaults
|
||||||
- Dependencies security updates
|
- Dependencies security updates
|
||||||
|
|||||||
@@ -1,21 +1,28 @@
|
|||||||
|
map $http_x_forwarded_port $nc_port {
|
||||||
|
default "$http_x_forwarded_port";
|
||||||
|
'' "$server_port";
|
||||||
|
}
|
||||||
|
|
||||||
|
map $http_x_forwarded_proto $nc_proto {
|
||||||
|
default "$http_x_forwarded_proto";
|
||||||
|
'' "$scheme";
|
||||||
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 8888;
|
listen 8888;
|
||||||
listen [::]:8888;
|
|
||||||
root /nextcloud;
|
root /nextcloud;
|
||||||
|
|
||||||
# Emit relative redirects (protocol handled by reverse proxy)
|
|
||||||
absolute_redirect off;
|
|
||||||
|
|
||||||
fastcgi_buffers 64 4K;
|
fastcgi_buffers 64 4K;
|
||||||
fastcgi_hide_header X-Powered-By;
|
fastcgi_hide_header X-Powered-By;
|
||||||
large_client_header_buffers 4 16k;
|
large_client_header_buffers 4 16k;
|
||||||
client_body_timeout 300s;
|
|
||||||
|
|
||||||
add_header Referrer-Policy "no-referrer" always;
|
add_header Referrer-Policy "no-referrer" always;
|
||||||
add_header X-Content-Type-Options "nosniff" always;
|
add_header X-Content-Type-Options "nosniff" always;
|
||||||
|
add_header X-Download-Options "noopen" always;
|
||||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||||
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
||||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||||
|
add_header X-XSS-Protection "0" always;
|
||||||
|
|
||||||
location = /robots.txt {
|
location = /robots.txt {
|
||||||
allow all;
|
allow all;
|
||||||
@@ -24,18 +31,14 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location ^~ /.well-known {
|
location ^~ /.well-known {
|
||||||
location = /.well-known/carddav { return 301 /remote.php/dav/; }
|
location = /.well-known/carddav { return 301 $nc_proto://$host/remote.php/dav; }
|
||||||
location = /.well-known/caldav { return 301 /remote.php/dav/; }
|
location = /.well-known/caldav { return 301 $nc_proto://$host/remote.php/dav; }
|
||||||
|
location ^~ /.well-known { return 301 $nc_proto://$host/index.php$uri; }
|
||||||
return 301 /index.php$request_uri;
|
try_files $uri $uri/ =404;
|
||||||
}
|
}
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
rewrite ^ /index.php$request_uri;
|
rewrite ^ /index.php$uri;
|
||||||
}
|
|
||||||
|
|
||||||
location /remote {
|
|
||||||
return 301 /remote.php$request_uri;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) {
|
location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) {
|
||||||
@@ -46,9 +49,9 @@ server {
|
|||||||
return 404;
|
return 404;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy)\.php(?:$|\/) {
|
location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy)\.php(?:$|\/) {
|
||||||
include /etc/nginx/fastcgi_params;
|
include /etc/nginx/fastcgi_params;
|
||||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
fastcgi_split_path_info ^(.+\.php)(/.*)$;
|
||||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
fastcgi_param PATH_INFO $fastcgi_path_info;
|
fastcgi_param PATH_INFO $fastcgi_path_info;
|
||||||
fastcgi_param modHeadersAvailable true;
|
fastcgi_param modHeadersAvailable true;
|
||||||
@@ -59,20 +62,25 @@ server {
|
|||||||
fastcgi_read_timeout 1200;
|
fastcgi_read_timeout 1200;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ ^/(?:updater|ocs-provider)(?:$|/) {
|
location ~ ^\/(?:updater|ocs-provider)(?:$|\/) {
|
||||||
try_files $uri/ =404;
|
try_files $uri/ =404;
|
||||||
index index.php;
|
index index.php;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|jpeg|png|webp|wasm|tflite|map|ogg|flac|mp4|webm)$ {
|
location ~ \.(?:css|js|svg|gif|map)$ {
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$uri$is_args$args;
|
||||||
expires 6M;
|
expires 6M;
|
||||||
access_log off;
|
access_log off;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ \.(otf|woff2?)$ {
|
location ~ \.woff2?$ {
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$uri$is_args$args;
|
||||||
expires 7d;
|
expires 7d;
|
||||||
access_log off;
|
access_log off;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location ~ \.(?:png|html|ttf|ico|jpg|jpeg|bcmap)$ {
|
||||||
|
try_files $uri /index.php$uri$is_args$args;
|
||||||
|
access_log off;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,11 +9,6 @@ events {
|
|||||||
|
|
||||||
http {
|
http {
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
# Add .mjs as a file extension for javascript
|
|
||||||
# https://github.com/nextcloud/server/pull/36057
|
|
||||||
types {
|
|
||||||
application/javascript mjs;
|
|
||||||
}
|
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
|
|
||||||
access_log /nginx/logs/access.log combined;
|
access_log /nginx/logs/access.log combined;
|
||||||
|
|||||||
@@ -15,16 +15,6 @@ if [ "$PHP_HARDENING" == "true" ] && [ ! -f /usr/local/etc/php/conf.d/snuffleupa
|
|||||||
cp /usr/local/etc/php/snuffleupagus/* /usr/local/etc/php/conf.d
|
cp /usr/local/etc/php/snuffleupagus/* /usr/local/etc/php/conf.d
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if database is available
|
|
||||||
if [ -n "${DB_TYPE}" ] && [ "${DB_TYPE}" != "sqlite3" ]; then
|
|
||||||
DB_PORT=${DB_PORT:-$( [ "${DB_TYPE}" = "pgsql" ] && echo 5432 || echo 3306 )}
|
|
||||||
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT}"
|
|
||||||
do
|
|
||||||
echo "waiting for the database container..."
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
# If new install, run setup
|
# If new install, run setup
|
||||||
if [ ! -f /nextcloud/config/config.php ]; then
|
if [ ! -f /nextcloud/config/config.php ]; then
|
||||||
touch /nextcloud/config/CAN_INSTALL
|
touch /nextcloud/config/CAN_INSTALL
|
||||||
@@ -34,4 +24,4 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Run processes
|
# Run processes
|
||||||
exec /usr/bin/s6-svscan /etc/s6.d
|
exec /bin/s6-svscan /etc/s6.d
|
||||||
|
|||||||
@@ -55,6 +55,14 @@ cat >> /nextcloud/config/autoconfig.php <<EOF;
|
|||||||
?>
|
?>
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
if [ ${DB_TYPE} != "sqlite3" ]; then
|
||||||
|
until nc -z "${DB_HOST:-nextcloud-db}" "${DB_PORT:-3306}"
|
||||||
|
do
|
||||||
|
echo "waiting for the database container..."
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
echo "Starting automatic configuration..."
|
echo "Starting automatic configuration..."
|
||||||
# Execute setup
|
# Execute setup
|
||||||
(cd /nextcloud; php index.php &>/dev/null)
|
(cd /nextcloud; php index.php &>/dev/null)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
zend_extension=opcache.so
|
zend_extension=opcache.so
|
||||||
opcache.enable=1
|
opcache.enable=1
|
||||||
opcache.enable_cli=1
|
opcache.enable_cli=1
|
||||||
|
opcache.fast_shutdown=1
|
||||||
opcache.memory_consumption=<OPCACHE_MEM_SIZE>
|
opcache.memory_consumption=<OPCACHE_MEM_SIZE>
|
||||||
opcache.interned_strings_buffer=16
|
opcache.interned_strings_buffer=16
|
||||||
opcache.max_accelerated_files=10000
|
opcache.max_accelerated_files=10000
|
||||||
|
|||||||
Reference in New Issue
Block a user