Compare commits
9 Commits
master
...
joshtricha
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
04944f9b73 | ||
|
|
02e9854e43 | ||
|
|
2d4cbb8029 | ||
|
|
ff04209c1d | ||
|
|
4dc80e8854 | ||
|
|
401cb79262 | ||
|
|
769d71f53f | ||
|
|
1455de82d0 | ||
|
|
da7104e93d |
@ -14,8 +14,4 @@ if (getenv('REDIS_HOST')) {
|
|||||||
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
||||||
$CONFIG['redis']['port'] = 6379;
|
$CONFIG['redis']['port'] = 6379;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getenv('REDIS_HOST_USER') !== false) {
|
|
||||||
$CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,8 +28,3 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
|
|||||||
if ($trustedProxies) {
|
if ($trustedProxies) {
|
||||||
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
||||||
}
|
}
|
||||||
|
|
||||||
$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
|
|
||||||
if ($forwardedForHeaders) {
|
|
||||||
$CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
|
|
||||||
}
|
|
||||||
|
|||||||
@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
|||||||
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
||||||
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
||||||
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
||||||
'autocreate' => strtolower($autocreate) !== 'false',
|
'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
|
||||||
'use_ssl' => strtolower($use_ssl) !== 'false',
|
'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
|
||||||
// required for some non Amazon S3 implementations
|
// required for some non Amazon S3 implementations
|
||||||
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
||||||
// required for older protocol versions
|
// required for older protocol versions
|
||||||
|
|||||||
@ -66,9 +66,9 @@ The following Dockerfile commands are also necessary for a sucessfull cron insta
|
|||||||
|
|
||||||
## docker-compose
|
## docker-compose
|
||||||
In `docker-compose` additional services are bundled to create a complete nextcloud installation. The examples are designed to run out-of-the-box.
|
In `docker-compose` additional services are bundled to create a complete nextcloud installation. The examples are designed to run out-of-the-box.
|
||||||
Before running the examples you have to modify the `db.env` and `compose.yaml` file and fill in your custom information.
|
Before running the examples you have to modify the `db.env` and `docker-compose.yml` file and fill in your custom information.
|
||||||
|
|
||||||
The docker compose examples make heavily use of derived Dockerfiles to add configuration files into the containers. This way they should also work on remote docker systems as _Docker for Windows_. When running docker compose on the same host as the docker daemon, another possibility would be to simply mount the files in the volumes section in the `compose.yaml` file.
|
The docker-compose examples make heavily use of derived Dockerfiles to add configuration files into the containers. This way they should also work on remote docker systems as _Docker for Windows_. When running docker-compose on the same host as the docker daemon, another possibility would be to simply mount the files in the volumes section in the `docker-compose.yml` file.
|
||||||
|
|
||||||
|
|
||||||
### insecure
|
### insecure
|
||||||
@ -78,10 +78,10 @@ For this use one of the [with-nginx-proxy](#with-nginx-proxy) examples.
|
|||||||
|
|
||||||
To use this example complete the following steps:
|
To use this example complete the following steps:
|
||||||
|
|
||||||
1. if you use mariadb or mysql choose a root password for the database in `compose.yaml` behind `MYSQL_ROOT_PASSWORD=`
|
1. if you use mariadb or mysql choose a root password for the database in `docker-compose.yml` behind `MYSQL_ROOT_PASSWORD=`
|
||||||
2. choose a password for the database user nextcloud in `db.env` behind `MYSQL_PASSWORD=` (for mariadb/mysql) or `POSTGRES_PASSWORD=` (for postgres)
|
2. choose a password for the database user nextcloud in `db.env` behind `MYSQL_PASSWORD=` (for mariadb/mysql) or `POSTGRES_PASSWORD=` (for postgres)
|
||||||
3. run `docker compose build --pull` to pull the most recent base images and build the custom dockerfiles
|
3. run `docker-compose build --pull` to pull the most recent base images and build the custom dockerfiles
|
||||||
4. start nextcloud with `docker compose up -d`
|
4. start nextcloud with `docker-compose up -d`
|
||||||
|
|
||||||
|
|
||||||
If you want to update your installation to a newer version of nextcloud, repeat the steps 3 and 4.
|
If you want to update your installation to a newer version of nextcloud, repeat the steps 3 and 4.
|
||||||
@ -97,13 +97,13 @@ This combination of the [nginxproxy/nginx-proxy](https://github.com/nginx-proxy/
|
|||||||
|
|
||||||
To use this example complete the following steps:
|
To use this example complete the following steps:
|
||||||
|
|
||||||
1. open `compose.yaml`
|
1. open `docker-compose.yml`
|
||||||
1. insert your nextcloud domain behind `VIRTUAL_HOST=`and `LETSENCRYPT_HOST=`
|
1. insert your nextcloud domain behind `VIRTUAL_HOST=`and `LETSENCRYPT_HOST=`
|
||||||
2. enter a valid email behind `LETSENCRYPT_EMAIL=`
|
2. enter a valid email behind `LETSENCRYPT_EMAIL=`
|
||||||
3. if you use mariadb or mysql choose a root password for the database behind `MYSQL_ROOT_PASSWORD=`
|
3. if you use mariadb or mysql choose a root password for the database behind `MYSQL_ROOT_PASSWORD=`
|
||||||
2. choose a password for the database user nextcloud in `db.env` behind `MYSQL_PASSWORD=` (for mariadb/mysql) or `POSTGRES_PASSWORD=` (for postgres)
|
2. choose a password for the database user nextcloud in `db.env` behind `MYSQL_PASSWORD=` (for mariadb/mysql) or `POSTGRES_PASSWORD=` (for postgres)
|
||||||
3. run `docker compose build --pull` to pull the most recent base images and build the custom dockerfiles
|
3. run `docker-compose build --pull` to pull the most recent base images and build the custom dockerfiles
|
||||||
4. start nextcloud with `docker compose up -d`
|
4. start nextcloud with `docker-compose up -d`
|
||||||
|
|
||||||
|
|
||||||
If you want to update your installation to a newer version of nextcloud, repeat the steps 3 and 4.
|
If you want to update your installation to a newer version of nextcloud, repeat the steps 3 and 4.
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# Note: MariaDB is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/mariadb
|
|
||||||
db:
|
db:
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
image: mariadb:10.6
|
||||||
image: mariadb:lts
|
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
|
||||||
command: --transaction-isolation=READ-COMMITTED
|
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- db:/var/lib/mysql:Z
|
- db:/var/lib/mysql:Z
|
||||||
@ -15,8 +14,6 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- db.env
|
- db.env
|
||||||
|
|
||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/redis
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine
|
image: redis:alpine
|
||||||
restart: always
|
restart: always
|
||||||
@ -28,7 +25,6 @@ services:
|
|||||||
- 127.0.0.1:8080:80
|
- 127.0.0.1:8080:80
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_HOST=db
|
- MYSQL_HOST=db
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
@ -43,7 +39,6 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
@ -1,67 +0,0 @@
|
|||||||
services:
|
|
||||||
# Note: MariaDB is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/mariadb
|
|
||||||
db:
|
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
|
||||||
image: mariadb:lts
|
|
||||||
command: --transaction-isolation=READ-COMMITTED
|
|
||||||
restart: always
|
|
||||||
volumes:
|
|
||||||
- db:/var/lib/mysql:Z
|
|
||||||
environment:
|
|
||||||
- MYSQL_ROOT_PASSWORD=
|
|
||||||
- MARIADB_AUTO_UPGRADE=1
|
|
||||||
- MARIADB_DISABLE_UPGRADE_BACKUP=1
|
|
||||||
env_file:
|
|
||||||
- db.env
|
|
||||||
|
|
||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/redis
|
|
||||||
redis:
|
|
||||||
image: redis:alpine
|
|
||||||
restart: always
|
|
||||||
|
|
||||||
app:
|
|
||||||
image: nextcloud:fpm-alpine
|
|
||||||
restart: always
|
|
||||||
volumes:
|
|
||||||
- nextcloud:/var/www/html:z
|
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
environment:
|
|
||||||
- MYSQL_HOST=db
|
|
||||||
- REDIS_HOST=redis
|
|
||||||
env_file:
|
|
||||||
- db.env
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
- redis
|
|
||||||
|
|
||||||
# Note: Nginx is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/nginx/
|
|
||||||
web:
|
|
||||||
image: nginx:alpine-slim
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- 127.0.0.1:8080:80
|
|
||||||
volumes:
|
|
||||||
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
|
|
||||||
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
|
|
||||||
# NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
|
|
||||||
- nextcloud:/var/www/html:z,ro
|
|
||||||
depends_on:
|
|
||||||
- app
|
|
||||||
|
|
||||||
cron:
|
|
||||||
image: nextcloud:fpm-alpine
|
|
||||||
restart: always
|
|
||||||
volumes:
|
|
||||||
- nextcloud:/var/www/html:z
|
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
entrypoint: /cron.sh
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
- redis
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
db:
|
|
||||||
nextcloud:
|
|
||||||
@ -0,0 +1,57 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
|
services:
|
||||||
|
db:
|
||||||
|
image: mariadb:10.6
|
||||||
|
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- db:/var/lib/mysql:Z
|
||||||
|
environment:
|
||||||
|
- MYSQL_ROOT_PASSWORD=
|
||||||
|
- MARIADB_AUTO_UPGRADE=1
|
||||||
|
- MARIADB_DISABLE_UPGRADE_BACKUP=1
|
||||||
|
env_file:
|
||||||
|
- db.env
|
||||||
|
|
||||||
|
redis:
|
||||||
|
image: redis:alpine
|
||||||
|
restart: always
|
||||||
|
|
||||||
|
app:
|
||||||
|
image: nextcloud:fpm-alpine
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- nextcloud:/var/www/html:z
|
||||||
|
environment:
|
||||||
|
- MYSQL_HOST=db
|
||||||
|
- REDIS_HOST=redis
|
||||||
|
env_file:
|
||||||
|
- db.env
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
- redis
|
||||||
|
|
||||||
|
web:
|
||||||
|
build: ./web
|
||||||
|
restart: always
|
||||||
|
ports:
|
||||||
|
- 127.0.0.1:8080:80
|
||||||
|
volumes:
|
||||||
|
- nextcloud:/var/www/html:z,ro
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
|
||||||
|
cron:
|
||||||
|
image: nextcloud:fpm-alpine
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- nextcloud:/var/www/html:z
|
||||||
|
entrypoint: /cron.sh
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
- redis
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
db:
|
||||||
|
nextcloud:
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
FROM nginx:alpine
|
||||||
|
|
||||||
|
COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
@ -12,9 +12,6 @@ events {
|
|||||||
http {
|
http {
|
||||||
include mime.types;
|
include mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
types {
|
|
||||||
text/javascript mjs;
|
|
||||||
}
|
|
||||||
|
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
'$status $body_bytes_sent "$http_referer" '
|
'$status $body_bytes_sent "$http_referer" '
|
||||||
@ -33,15 +30,13 @@ http {
|
|||||||
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
|
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
|
||||||
map $arg_v $asset_immutable {
|
map $arg_v $asset_immutable {
|
||||||
"" "";
|
"" "";
|
||||||
default ", immutable";
|
default "immutable";
|
||||||
}
|
}
|
||||||
|
|
||||||
#gzip on;
|
#gzip on;
|
||||||
|
|
||||||
resolver 127.0.0.11 valid=2s;
|
|
||||||
upstream php-handler {
|
upstream php-handler {
|
||||||
zone backends 64k;
|
server app:9000;
|
||||||
server app:9000 resolve;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
@ -145,7 +140,7 @@ http {
|
|||||||
# to the URI, resulting in a HTTP 500 error response.
|
# to the URI, resulting in a HTTP 500 error response.
|
||||||
location ~ \.php(?:$|/) {
|
location ~ \.php(?:$|/) {
|
||||||
# Required for legacy support
|
# Required for legacy support
|
||||||
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
|
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
|
||||||
|
|
||||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||||
set $path_info $fastcgi_path_info;
|
set $path_info $fastcgi_path_info;
|
||||||
@ -167,16 +162,24 @@ http {
|
|||||||
fastcgi_max_temp_file_size 0;
|
fastcgi_max_temp_file_size 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Serve static files
|
# Javascript mimetype fixes for nginx
|
||||||
location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|png|webp|wasm|tflite|map|ogg|flac)$ {
|
# Note: The block below should be removed, and the js|mjs section should be
|
||||||
|
# added to the block below this one. This is a temporary fix until Nginx
|
||||||
|
# upstream fixes the js mime-type
|
||||||
|
location ~* \.(?:js|mjs)$ {
|
||||||
|
types {
|
||||||
|
text/javascript js mjs;
|
||||||
|
}
|
||||||
|
default_type "text/javascript";
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$request_uri;
|
||||||
add_header Cache-Control "public, max-age=15778463$asset_immutable";
|
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
|
||||||
add_header Referrer-Policy "no-referrer" always;
|
access_log off;
|
||||||
add_header X-Content-Type-Options "nosniff" always;
|
}
|
||||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
|
||||||
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
# Serve static files
|
||||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
|
||||||
add_header X-XSS-Protection "1; mode=block" always;
|
try_files $uri /index.php$request_uri;
|
||||||
|
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
|
||||||
access_log off; # Optional: Don't log access to assets
|
access_log off; # Optional: Don't log access to assets
|
||||||
|
|
||||||
location ~ \.wasm$ {
|
location ~ \.wasm$ {
|
||||||
@ -184,7 +187,7 @@ http {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ \.(otf|woff2?)$ {
|
location ~ \.woff2?$ {
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$request_uri;
|
||||||
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
||||||
access_log off; # Optional: Don't log access to assets
|
access_log off; # Optional: Don't log access to assets
|
||||||
|
|||||||
@ -1,8 +1,7 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# Note: PostgreSQL is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/postgres
|
|
||||||
db:
|
db:
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
|
||||||
image: postgres:alpine
|
image: postgres:alpine
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
@ -10,8 +9,6 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- db.env
|
- db.env
|
||||||
|
|
||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/redis
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine
|
image: redis:alpine
|
||||||
restart: always
|
restart: always
|
||||||
@ -23,7 +20,6 @@ services:
|
|||||||
- 127.0.0.1:8080:80
|
- 127.0.0.1:8080:80
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_HOST=db
|
- POSTGRES_HOST=db
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
@ -38,7 +34,6 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
@ -1,62 +0,0 @@
|
|||||||
services:
|
|
||||||
# Note: PostgreSQL is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/postgres
|
|
||||||
db:
|
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
|
||||||
image: postgres:alpine
|
|
||||||
restart: always
|
|
||||||
volumes:
|
|
||||||
- db:/var/lib/postgresql/data:Z
|
|
||||||
env_file:
|
|
||||||
- db.env
|
|
||||||
|
|
||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/redis
|
|
||||||
redis:
|
|
||||||
image: redis:alpine
|
|
||||||
restart: always
|
|
||||||
|
|
||||||
app:
|
|
||||||
image: nextcloud:fpm-alpine
|
|
||||||
restart: always
|
|
||||||
volumes:
|
|
||||||
- nextcloud:/var/www/html:z
|
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
environment:
|
|
||||||
- POSTGRES_HOST=db
|
|
||||||
- REDIS_HOST=redis
|
|
||||||
env_file:
|
|
||||||
- db.env
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
- redis
|
|
||||||
|
|
||||||
# Note: Nginx is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/nginx/
|
|
||||||
web:
|
|
||||||
image: nginx:alpine-slim
|
|
||||||
restart: always
|
|
||||||
ports:
|
|
||||||
- 127.0.0.1:8080:80
|
|
||||||
volumes:
|
|
||||||
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
|
|
||||||
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
|
|
||||||
# NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
|
|
||||||
- nextcloud:/var/www/html:z,ro
|
|
||||||
depends_on:
|
|
||||||
- app
|
|
||||||
|
|
||||||
cron:
|
|
||||||
image: nextcloud:fpm-alpine
|
|
||||||
restart: always
|
|
||||||
volumes:
|
|
||||||
- nextcloud:/var/www/html:z
|
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
entrypoint: /cron.sh
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
- redis
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
db:
|
|
||||||
nextcloud:
|
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
|
services:
|
||||||
|
db:
|
||||||
|
image: postgres:alpine
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- db:/var/lib/postgresql/data:z
|
||||||
|
env_file:
|
||||||
|
- db.env
|
||||||
|
|
||||||
|
redis:
|
||||||
|
image: redis:alpine
|
||||||
|
restart: always
|
||||||
|
|
||||||
|
app:
|
||||||
|
image: nextcloud:fpm-alpine
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- nextcloud:/var/www/html:z
|
||||||
|
environment:
|
||||||
|
- POSTGRES_HOST=db
|
||||||
|
- REDIS_HOST=redis
|
||||||
|
env_file:
|
||||||
|
- db.env
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
- redis
|
||||||
|
|
||||||
|
web:
|
||||||
|
build: ./web
|
||||||
|
restart: always
|
||||||
|
ports:
|
||||||
|
- 127.0.0.1:8080:80
|
||||||
|
volumes:
|
||||||
|
- nextcloud:/var/www/html:z,ro
|
||||||
|
depends_on:
|
||||||
|
- app
|
||||||
|
|
||||||
|
cron:
|
||||||
|
image: nextcloud:fpm-alpine
|
||||||
|
restart: always
|
||||||
|
volumes:
|
||||||
|
- nextcloud:/var/www/html:z
|
||||||
|
entrypoint: /cron.sh
|
||||||
|
depends_on:
|
||||||
|
- db
|
||||||
|
- redis
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
db:
|
||||||
|
nextcloud:
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
FROM nginx:alpine
|
||||||
|
|
||||||
|
COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
@ -12,9 +12,6 @@ events {
|
|||||||
http {
|
http {
|
||||||
include mime.types;
|
include mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
types {
|
|
||||||
text/javascript mjs;
|
|
||||||
}
|
|
||||||
|
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
'$status $body_bytes_sent "$http_referer" '
|
'$status $body_bytes_sent "$http_referer" '
|
||||||
@ -33,15 +30,13 @@ http {
|
|||||||
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
|
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
|
||||||
map $arg_v $asset_immutable {
|
map $arg_v $asset_immutable {
|
||||||
"" "";
|
"" "";
|
||||||
default ", immutable";
|
default "immutable";
|
||||||
}
|
}
|
||||||
|
|
||||||
#gzip on;
|
#gzip on;
|
||||||
|
|
||||||
resolver 127.0.0.11 valid=2s;
|
|
||||||
upstream php-handler {
|
upstream php-handler {
|
||||||
zone backends 64k;
|
server app:9000;
|
||||||
server app:9000 resolve;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
@ -145,7 +140,7 @@ http {
|
|||||||
# to the URI, resulting in a HTTP 500 error response.
|
# to the URI, resulting in a HTTP 500 error response.
|
||||||
location ~ \.php(?:$|/) {
|
location ~ \.php(?:$|/) {
|
||||||
# Required for legacy support
|
# Required for legacy support
|
||||||
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
|
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
|
||||||
|
|
||||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||||
set $path_info $fastcgi_path_info;
|
set $path_info $fastcgi_path_info;
|
||||||
@ -167,16 +162,23 @@ http {
|
|||||||
fastcgi_max_temp_file_size 0;
|
fastcgi_max_temp_file_size 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Serve static files
|
# Javascript mimetype fixes for nginx
|
||||||
location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|png|webp|wasm|tflite|map|ogg|flac)$ {
|
# Note: The block below should be removed, and the js|mjs section should be
|
||||||
|
# added to the block below this one. This is a temporary fix until Nginx
|
||||||
|
# upstream fixes the js mime-type
|
||||||
|
location ~* \.(?:js|mjs)$ {
|
||||||
|
types {
|
||||||
|
text/javascript js mjs;
|
||||||
|
}
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$request_uri;
|
||||||
add_header Cache-Control "public, max-age=15778463$asset_immutable";
|
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
|
||||||
add_header Referrer-Policy "no-referrer" always;
|
access_log off;
|
||||||
add_header X-Content-Type-Options "nosniff" always;
|
}
|
||||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
|
||||||
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
# Serve static files
|
||||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
|
||||||
add_header X-XSS-Protection "1; mode=block" always;
|
try_files $uri /index.php$request_uri;
|
||||||
|
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
|
||||||
access_log off; # Optional: Don't log access to assets
|
access_log off; # Optional: Don't log access to assets
|
||||||
|
|
||||||
location ~ \.wasm$ {
|
location ~ \.wasm$ {
|
||||||
@ -184,7 +186,7 @@ http {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ \.(otf|woff2?)$ {
|
location ~ \.woff2?$ {
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$request_uri;
|
||||||
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
||||||
access_log off; # Optional: Don't log access to assets
|
access_log off; # Optional: Don't log access to assets
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# Note: MariaDB is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/mariadb
|
|
||||||
db:
|
db:
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
image: mariadb:10.6
|
||||||
image: mariadb:lts
|
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
|
||||||
command: --transaction-isolation=READ-COMMITTED
|
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- db:/var/lib/mysql:Z
|
- db:/var/lib/mysql:Z
|
||||||
@ -15,8 +14,6 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- db.env
|
- db.env
|
||||||
|
|
||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/redis
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine
|
image: redis:alpine
|
||||||
restart: always
|
restart: always
|
||||||
@ -26,7 +23,6 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
environment:
|
environment:
|
||||||
- VIRTUAL_HOST=
|
- VIRTUAL_HOST=
|
||||||
- LETSENCRYPT_HOST=
|
- LETSENCRYPT_HOST=
|
||||||
@ -38,7 +34,6 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
- proxy
|
|
||||||
networks:
|
networks:
|
||||||
- proxy-tier
|
- proxy-tier
|
||||||
- default
|
- default
|
||||||
@ -48,15 +43,11 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
# Note: Nginx-proxy is an external service. You can find more information about the configuration here:
|
|
||||||
# Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
|
|
||||||
# https://hub.docker.com/r/nginxproxy/nginx-proxy
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./proxy
|
build: ./proxy
|
||||||
restart: always
|
restart: always
|
||||||
@ -64,23 +55,18 @@ services:
|
|||||||
- 80:80
|
- 80:80
|
||||||
- 443:443
|
- 443:443
|
||||||
labels:
|
labels:
|
||||||
- "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy"
|
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
|
||||||
volumes:
|
volumes:
|
||||||
- certs:/etc/nginx/certs:ro,z
|
- certs:/etc/nginx/certs:z,ro
|
||||||
- vhost.d:/etc/nginx/vhost.d:z
|
- vhost.d:/etc/nginx/vhost.d:z
|
||||||
- html:/usr/share/nginx/html:z
|
- html:/usr/share/nginx/html:z
|
||||||
- dhparam:/etc/nginx/dhparam:z
|
|
||||||
- /var/run/docker.sock:/tmp/docker.sock:z,ro
|
- /var/run/docker.sock:/tmp/docker.sock:z,ro
|
||||||
networks:
|
networks:
|
||||||
- proxy-tier
|
- proxy-tier
|
||||||
|
|
||||||
# Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/r/nginxproxy/acme-companion
|
|
||||||
letsencrypt-companion:
|
letsencrypt-companion:
|
||||||
image: nginxproxy/acme-companion
|
image: nginxproxy/acme-companion
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
|
||||||
- DEFAULT_EMAIL=
|
|
||||||
volumes:
|
volumes:
|
||||||
- certs:/etc/nginx/certs:z
|
- certs:/etc/nginx/certs:z
|
||||||
- acme:/etc/acme.sh:z
|
- acme:/etc/acme.sh:z
|
||||||
@ -92,7 +78,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- proxy
|
- proxy
|
||||||
|
|
||||||
# self signed,outdated
|
# self signed
|
||||||
# omgwtfssl:
|
# omgwtfssl:
|
||||||
# image: paulczar/omgwtfssl
|
# image: paulczar/omgwtfssl
|
||||||
# restart: "no"
|
# restart: "no"
|
||||||
@ -114,7 +100,6 @@ volumes:
|
|||||||
acme:
|
acme:
|
||||||
vhost.d:
|
vhost.d:
|
||||||
html:
|
html:
|
||||||
dhparam:
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
proxy-tier:
|
proxy-tier:
|
||||||
@ -1,3 +1,3 @@
|
|||||||
FROM nginxproxy/nginx-proxy:1.7-alpine
|
FROM nginxproxy/nginx-proxy:alpine
|
||||||
|
|
||||||
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
|
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# Note: MariaDB is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/mariadb
|
|
||||||
db:
|
db:
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
image: mariadb:10.6
|
||||||
image: mariadb:lts
|
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
|
||||||
command: --transaction-isolation=READ-COMMITTED
|
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- db:/var/lib/mysql:Z
|
- db:/var/lib/mysql:Z
|
||||||
@ -15,8 +14,6 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- db.env
|
- db.env
|
||||||
|
|
||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/redis
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine
|
image: redis:alpine
|
||||||
restart: always
|
restart: always
|
||||||
@ -26,7 +23,6 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_HOST=db
|
- MYSQL_HOST=db
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
@ -35,17 +31,11 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
- proxy
|
|
||||||
|
|
||||||
# Note: Nginx is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/nginx/
|
|
||||||
web:
|
web:
|
||||||
image: nginx:alpine-slim
|
build: ./web
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
|
|
||||||
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
|
|
||||||
# NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
|
|
||||||
- nextcloud:/var/www/html:z,ro
|
- nextcloud:/var/www/html:z,ro
|
||||||
environment:
|
environment:
|
||||||
- VIRTUAL_HOST=
|
- VIRTUAL_HOST=
|
||||||
@ -62,15 +52,11 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
# Note: Nginx-proxy is an external service. You can find more information about the configuration here:
|
|
||||||
# Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
|
|
||||||
# https://hub.docker.com/r/nginxproxy/nginx-proxy
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./proxy
|
build: ./proxy
|
||||||
restart: always
|
restart: always
|
||||||
@ -78,7 +64,7 @@ services:
|
|||||||
- 80:80
|
- 80:80
|
||||||
- 443:443
|
- 443:443
|
||||||
labels:
|
labels:
|
||||||
- "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy"
|
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
|
||||||
volumes:
|
volumes:
|
||||||
- certs:/etc/nginx/certs:z,ro
|
- certs:/etc/nginx/certs:z,ro
|
||||||
- vhost.d:/etc/nginx/vhost.d:z
|
- vhost.d:/etc/nginx/vhost.d:z
|
||||||
@ -87,13 +73,9 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- proxy-tier
|
- proxy-tier
|
||||||
|
|
||||||
# Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/r/nginxproxy/acme-companion
|
|
||||||
letsencrypt-companion:
|
letsencrypt-companion:
|
||||||
image: nginxproxy/acme-companion
|
image: nginxproxy/acme-companion
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
|
||||||
- DEFAULT_EMAIL=
|
|
||||||
volumes:
|
volumes:
|
||||||
- certs:/etc/nginx/certs:z
|
- certs:/etc/nginx/certs:z
|
||||||
- acme:/etc/acme.sh:z
|
- acme:/etc/acme.sh:z
|
||||||
@ -105,7 +87,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- proxy
|
- proxy
|
||||||
|
|
||||||
# self signed, outdated.
|
# self signed
|
||||||
# omgwtfssl:
|
# omgwtfssl:
|
||||||
# image: paulczar/omgwtfssl
|
# image: paulczar/omgwtfssl
|
||||||
# restart: "no"
|
# restart: "no"
|
||||||
@ -1,3 +1,3 @@
|
|||||||
FROM nginxproxy/nginx-proxy:1.7-alpine
|
FROM nginxproxy/nginx-proxy:alpine
|
||||||
|
|
||||||
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
|
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
|
||||||
|
|||||||
@ -0,0 +1,3 @@
|
|||||||
|
FROM nginx:alpine
|
||||||
|
|
||||||
|
COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
@ -12,9 +12,6 @@ events {
|
|||||||
http {
|
http {
|
||||||
include mime.types;
|
include mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
types {
|
|
||||||
text/javascript mjs;
|
|
||||||
}
|
|
||||||
|
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
'$status $body_bytes_sent "$http_referer" '
|
'$status $body_bytes_sent "$http_referer" '
|
||||||
@ -33,15 +30,13 @@ http {
|
|||||||
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
|
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
|
||||||
map $arg_v $asset_immutable {
|
map $arg_v $asset_immutable {
|
||||||
"" "";
|
"" "";
|
||||||
default ", immutable";
|
default "immutable";
|
||||||
}
|
}
|
||||||
|
|
||||||
#gzip on;
|
#gzip on;
|
||||||
|
|
||||||
resolver 127.0.0.11 valid=2s;
|
|
||||||
upstream php-handler {
|
upstream php-handler {
|
||||||
zone backends 64k;
|
server app:9000;
|
||||||
server app:9000 resolve;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
@ -145,7 +140,7 @@ http {
|
|||||||
# to the URI, resulting in a HTTP 500 error response.
|
# to the URI, resulting in a HTTP 500 error response.
|
||||||
location ~ \.php(?:$|/) {
|
location ~ \.php(?:$|/) {
|
||||||
# Required for legacy support
|
# Required for legacy support
|
||||||
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
|
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
|
||||||
|
|
||||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||||
set $path_info $fastcgi_path_info;
|
set $path_info $fastcgi_path_info;
|
||||||
@ -167,16 +162,23 @@ http {
|
|||||||
fastcgi_max_temp_file_size 0;
|
fastcgi_max_temp_file_size 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Serve static files
|
# Javascript mimetype fixes for nginx
|
||||||
location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|png|webp|wasm|tflite|map|ogg|flac)$ {
|
# Note: The block below should be removed, and the js|mjs section should be
|
||||||
|
# added to the block below this one. This is a temporary fix until Nginx
|
||||||
|
# upstream fixes the js mime-type
|
||||||
|
location ~* \.(?:js|mjs)$ {
|
||||||
|
types {
|
||||||
|
text/javascript js mjs;
|
||||||
|
}
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$request_uri;
|
||||||
add_header Cache-Control "public, max-age=15778463$asset_immutable";
|
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
|
||||||
add_header Referrer-Policy "no-referrer" always;
|
access_log off;
|
||||||
add_header X-Content-Type-Options "nosniff" always;
|
}
|
||||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
|
||||||
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
# Serve static files
|
||||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
|
||||||
add_header X-XSS-Protection "1; mode=block" always;
|
try_files $uri /index.php$request_uri;
|
||||||
|
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
|
||||||
access_log off; # Optional: Don't log access to assets
|
access_log off; # Optional: Don't log access to assets
|
||||||
|
|
||||||
location ~ \.wasm$ {
|
location ~ \.wasm$ {
|
||||||
@ -184,7 +186,7 @@ http {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ \.(otf|woff2?)$ {
|
location ~ \.woff2?$ {
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$request_uri;
|
||||||
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
||||||
access_log off; # Optional: Don't log access to assets
|
access_log off; # Optional: Don't log access to assets
|
||||||
|
|||||||
@ -1,8 +1,7 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# Note: PostgreSQL is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/postgres
|
|
||||||
db:
|
db:
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
|
||||||
image: postgres:alpine
|
image: postgres:alpine
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
@ -10,8 +9,6 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- db.env
|
- db.env
|
||||||
|
|
||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/redis
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine
|
image: redis:alpine
|
||||||
restart: always
|
restart: always
|
||||||
@ -21,7 +18,6 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
environment:
|
environment:
|
||||||
- VIRTUAL_HOST=
|
- VIRTUAL_HOST=
|
||||||
- LETSENCRYPT_HOST=
|
- LETSENCRYPT_HOST=
|
||||||
@ -33,7 +29,6 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
- proxy
|
|
||||||
networks:
|
networks:
|
||||||
- proxy-tier
|
- proxy-tier
|
||||||
- default
|
- default
|
||||||
@ -43,15 +38,11 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
# Note: Nginx-proxy is an external service. You can find more information about the configuration here:
|
|
||||||
# Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
|
|
||||||
# https://hub.docker.com/r/nginxproxy/nginx-proxy
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./proxy
|
build: ./proxy
|
||||||
restart: always
|
restart: always
|
||||||
@ -59,17 +50,15 @@ services:
|
|||||||
- 80:80
|
- 80:80
|
||||||
- 443:443
|
- 443:443
|
||||||
labels:
|
labels:
|
||||||
- "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy"
|
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
|
||||||
volumes:
|
volumes:
|
||||||
- certs:/etc/nginx/certs:ro,z
|
- certs:/etc/nginx/certs:z,ro
|
||||||
- vhost.d:/etc/nginx/vhost.d:z
|
- vhost.d:/etc/nginx/vhost.d:z
|
||||||
- html:/usr/share/nginx/html:z
|
- html:/usr/share/nginx/html:z
|
||||||
- /var/run/docker.sock:/tmp/docker.sock:z,ro
|
- /var/run/docker.sock:/tmp/docker.sock:z,ro
|
||||||
networks:
|
networks:
|
||||||
- proxy-tier
|
- proxy-tier
|
||||||
|
|
||||||
# Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/r/nginxproxy/acme-companion
|
|
||||||
letsencrypt-companion:
|
letsencrypt-companion:
|
||||||
image: nginxproxy/acme-companion
|
image: nginxproxy/acme-companion
|
||||||
restart: always
|
restart: always
|
||||||
@ -84,7 +73,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- proxy
|
- proxy
|
||||||
|
|
||||||
# self signed, outdated
|
# self signed
|
||||||
# omgwtfssl:
|
# omgwtfssl:
|
||||||
# image: paulczar/omgwtfssl
|
# image: paulczar/omgwtfssl
|
||||||
# restart: "no"
|
# restart: "no"
|
||||||
@ -1,3 +1,3 @@
|
|||||||
FROM nginxproxy/nginx-proxy:1.7-alpine
|
FROM nginxproxy/nginx-proxy:alpine
|
||||||
|
|
||||||
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
|
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
|
||||||
|
|||||||
@ -1,8 +1,7 @@
|
|||||||
|
version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# Note: PostgreSQL is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/postgres
|
|
||||||
db:
|
db:
|
||||||
# Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
|
|
||||||
image: postgres:alpine
|
image: postgres:alpine
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
@ -10,8 +9,6 @@ services:
|
|||||||
env_file:
|
env_file:
|
||||||
- db.env
|
- db.env
|
||||||
|
|
||||||
# Note: Redis is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/redis
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:alpine
|
image: redis:alpine
|
||||||
restart: always
|
restart: always
|
||||||
@ -21,7 +18,6 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_HOST=db
|
- POSTGRES_HOST=db
|
||||||
- REDIS_HOST=redis
|
- REDIS_HOST=redis
|
||||||
@ -30,17 +26,11 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
- proxy
|
|
||||||
|
|
||||||
# Note: Nginx is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/_/nginx/
|
|
||||||
web:
|
web:
|
||||||
image: nginx:alpine-slim
|
build: ./web
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
|
|
||||||
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
|
|
||||||
# NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
|
|
||||||
- nextcloud:/var/www/html:z,ro
|
- nextcloud:/var/www/html:z,ro
|
||||||
environment:
|
environment:
|
||||||
- VIRTUAL_HOST=
|
- VIRTUAL_HOST=
|
||||||
@ -57,15 +47,11 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- nextcloud:/var/www/html:z
|
- nextcloud:/var/www/html:z
|
||||||
# NOTE: The `volumes` config of the `cron` and `app` containers must match
|
|
||||||
entrypoint: /cron.sh
|
entrypoint: /cron.sh
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
# Note: Nginx-proxy is an external service. You can find more information about the configuration here:
|
|
||||||
# Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
|
|
||||||
# https://hub.docker.com/r/nginxproxy/nginx-proxy
|
|
||||||
proxy:
|
proxy:
|
||||||
build: ./proxy
|
build: ./proxy
|
||||||
restart: always
|
restart: always
|
||||||
@ -73,7 +59,7 @@ services:
|
|||||||
- 80:80
|
- 80:80
|
||||||
- 443:443
|
- 443:443
|
||||||
labels:
|
labels:
|
||||||
- "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy"
|
com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true"
|
||||||
volumes:
|
volumes:
|
||||||
- certs:/etc/nginx/certs:z,ro
|
- certs:/etc/nginx/certs:z,ro
|
||||||
- vhost.d:/etc/nginx/vhost.d:z
|
- vhost.d:/etc/nginx/vhost.d:z
|
||||||
@ -82,8 +68,6 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- proxy-tier
|
- proxy-tier
|
||||||
|
|
||||||
# Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
|
|
||||||
# https://hub.docker.com/r/nginxproxy/acme-companion
|
|
||||||
letsencrypt-companion:
|
letsencrypt-companion:
|
||||||
image: nginxproxy/acme-companion
|
image: nginxproxy/acme-companion
|
||||||
restart: always
|
restart: always
|
||||||
@ -93,14 +77,12 @@ services:
|
|||||||
- vhost.d:/etc/nginx/vhost.d:z
|
- vhost.d:/etc/nginx/vhost.d:z
|
||||||
- html:/usr/share/nginx/html:z
|
- html:/usr/share/nginx/html:z
|
||||||
- /var/run/docker.sock:/var/run/docker.sock:z,ro
|
- /var/run/docker.sock:/var/run/docker.sock:z,ro
|
||||||
environment:
|
|
||||||
- DEFAULT_EMAIL=
|
|
||||||
networks:
|
networks:
|
||||||
- proxy-tier
|
- proxy-tier
|
||||||
depends_on:
|
depends_on:
|
||||||
- proxy
|
- proxy
|
||||||
|
|
||||||
# self signed, outdated
|
# self signed
|
||||||
# omgwtfssl:
|
# omgwtfssl:
|
||||||
# image: paulczar/omgwtfssl
|
# image: paulczar/omgwtfssl
|
||||||
# restart: "no"
|
# restart: "no"
|
||||||
@ -1,3 +1,3 @@
|
|||||||
FROM nginxproxy/nginx-proxy:1.7-alpine
|
FROM nginxproxy/nginx-proxy:alpine
|
||||||
|
|
||||||
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
|
COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
|
||||||
|
|||||||
@ -0,0 +1,3 @@
|
|||||||
|
FROM nginx:alpine
|
||||||
|
|
||||||
|
COPY nginx.conf /etc/nginx/nginx.conf
|
||||||
@ -12,9 +12,6 @@ events {
|
|||||||
http {
|
http {
|
||||||
include mime.types;
|
include mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
types {
|
|
||||||
text/javascript mjs;
|
|
||||||
}
|
|
||||||
|
|
||||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
'$status $body_bytes_sent "$http_referer" '
|
'$status $body_bytes_sent "$http_referer" '
|
||||||
@ -33,15 +30,13 @@ http {
|
|||||||
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
|
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
|
||||||
map $arg_v $asset_immutable {
|
map $arg_v $asset_immutable {
|
||||||
"" "";
|
"" "";
|
||||||
default ", immutable";
|
default "immutable";
|
||||||
}
|
}
|
||||||
|
|
||||||
#gzip on;
|
#gzip on;
|
||||||
|
|
||||||
resolver 127.0.0.11 valid=2s;
|
|
||||||
upstream php-handler {
|
upstream php-handler {
|
||||||
zone backends 64k;
|
server app:9000;
|
||||||
server app:9000 resolve;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
@ -145,7 +140,7 @@ http {
|
|||||||
# to the URI, resulting in a HTTP 500 error response.
|
# to the URI, resulting in a HTTP 500 error response.
|
||||||
location ~ \.php(?:$|/) {
|
location ~ \.php(?:$|/) {
|
||||||
# Required for legacy support
|
# Required for legacy support
|
||||||
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode(_arm64)?\/proxy) /index.php$request_uri;
|
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
|
||||||
|
|
||||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||||
set $path_info $fastcgi_path_info;
|
set $path_info $fastcgi_path_info;
|
||||||
@ -167,16 +162,23 @@ http {
|
|||||||
fastcgi_max_temp_file_size 0;
|
fastcgi_max_temp_file_size 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Serve static files
|
# Javascript mimetype fixes for nginx
|
||||||
location ~ \.(?:css|js|mjs|svg|gif|ico|jpg|png|webp|wasm|tflite|map|ogg|flac)$ {
|
# Note: The block below should be removed, and the js|mjs section should be
|
||||||
|
# added to the block below this one. This is a temporary fix until Nginx
|
||||||
|
# upstream fixes the js mime-type
|
||||||
|
location ~* \.(?:js|mjs)$ {
|
||||||
|
types {
|
||||||
|
text/javascript js mjs;
|
||||||
|
}
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$request_uri;
|
||||||
add_header Cache-Control "public, max-age=15778463$asset_immutable";
|
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
|
||||||
add_header Referrer-Policy "no-referrer" always;
|
access_log off;
|
||||||
add_header X-Content-Type-Options "nosniff" always;
|
}
|
||||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
|
||||||
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
# Serve static files
|
||||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
|
||||||
add_header X-XSS-Protection "1; mode=block" always;
|
try_files $uri /index.php$request_uri;
|
||||||
|
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
|
||||||
access_log off; # Optional: Don't log access to assets
|
access_log off; # Optional: Don't log access to assets
|
||||||
|
|
||||||
location ~ \.wasm$ {
|
location ~ \.wasm$ {
|
||||||
@ -184,7 +186,7 @@ http {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~ \.(otf|woff2?)$ {
|
location ~ \.woff2?$ {
|
||||||
try_files $uri /index.php$request_uri;
|
try_files $uri /index.php$request_uri;
|
||||||
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
||||||
access_log off; # Optional: Don't log access to assets
|
access_log off; # Optional: Don't log access to assets
|
||||||
|
|||||||
15
.github/ISSUE_TEMPLATE/02-Image_enhancement
vendored
15
.github/ISSUE_TEMPLATE/02-Image_enhancement
vendored
@ -1,15 +0,0 @@
|
|||||||
---
|
|
||||||
name: 🚀 Suggest an enhancement
|
|
||||||
about: Suggest an idea for improving the image
|
|
||||||
labels: "enhancement, 0. Needs triage"
|
|
||||||
---
|
|
||||||
|
|
||||||
<!--
|
|
||||||
Thanks for suggesting an idea to improve the Nextcloud Docker image!
|
|
||||||
|
|
||||||
This image is maintained by volunteers so if you're able to assist with implementing your idea, please mention that (and consider submitting a PR as well).
|
|
||||||
|
|
||||||
Note: This is the issue tracker of the official Nextcloud **Docker image**, please do NOT use this to suggestion enhancements in Nextcloud Server itself.
|
|
||||||
|
|
||||||
To learn more about official images, see https://github.com/docker-library/faq
|
|
||||||
-->
|
|
||||||
@ -1,7 +1,6 @@
|
|||||||
---
|
---
|
||||||
name: 🐛 Report a bug in the image
|
name: 🐛 Image issue
|
||||||
about: Create a report to help us improve the image
|
about: Issues related to the Nextcloud Docker image
|
||||||
labels: "bug, 0. Needs triage"
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
28
.github/ISSUE_TEMPLATE/config.yml
vendored
28
.github/ISSUE_TEMPLATE/config.yml
vendored
@ -1,22 +1,10 @@
|
|||||||
contact_links:
|
contact_links:
|
||||||
- name: ❓ Ask a question
|
- name: 🐛 Nextcloud issue
|
||||||
url: https://help.nextcloud.com/
|
url: https://github.com/nextcloud/server/issues/new/choose
|
||||||
about: Ask a question, get assistance or start a discussion regarding Nextcloud and/or this image
|
about: Bug reports and feature requests for Nextcloud
|
||||||
- name: Documentation - Nextcloud Server
|
- name: 🐳 Docker Support and Help
|
||||||
url: https://docs.nextcloud.com/
|
|
||||||
about: Official documentation for Nextcloud Server
|
|
||||||
- name: Documentation - Nextcloud Docker Image
|
|
||||||
url: https://github.com/nextcloud/docker/blob/master/README.md
|
|
||||||
about: Official documentation for this image
|
|
||||||
- name: 🐳 Documentation - Docker
|
|
||||||
url: https://docs.docker.com/
|
|
||||||
about: Official documentation for Docker (installing, configuring, troubleshooting)
|
|
||||||
- name: 🐳 Docker Forum
|
|
||||||
url: https://forums.docker.com/
|
url: https://forums.docker.com/
|
||||||
about: Ask a question, get assistance or start a discussion regarding Docker
|
about: Configuration, installation, networking and other questions
|
||||||
- name: 🐛 Bug Report - Nextcloud Server
|
- name: ❓ Nextcloud Support and Help
|
||||||
url: https://github.com/nextcloud/server/issues/new/choose
|
url: https://help.nextcloud.com/
|
||||||
about: Report a bug in Nextcloud Server
|
about: Configuration, webserver/proxy or performance issues and other questions
|
||||||
- name: Enhancement Idea - Nextcloud Server
|
|
||||||
url: https://github.com/nextcloud/server/issues/new/choose
|
|
||||||
about: Suggest an enhancement idea for Nextcloud Server
|
|
||||||
|
|||||||
51
.github/workflows/command-rebase.yml
vendored
Normal file
51
.github/workflows/command-rebase.yml
vendored
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
# This workflow is provided via the organization template repository
|
||||||
|
#
|
||||||
|
# https://github.com/nextcloud/.github
|
||||||
|
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
|
||||||
|
|
||||||
|
name: Rebase command
|
||||||
|
|
||||||
|
on:
|
||||||
|
issue_comment:
|
||||||
|
types: created
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
rebase:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: none
|
||||||
|
|
||||||
|
# On pull requests and if the comment starts with `/rebase`
|
||||||
|
if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/rebase')
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Add reaction on start
|
||||||
|
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.COMMAND_BOT_PAT }}
|
||||||
|
repository: ${{ github.event.repository.full_name }}
|
||||||
|
comment-id: ${{ github.event.comment.id }}
|
||||||
|
reaction-type: "+1"
|
||||||
|
|
||||||
|
- name: Checkout the latest code
|
||||||
|
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
token: ${{ secrets.COMMAND_BOT_PAT }}
|
||||||
|
|
||||||
|
- name: Automatic Rebase
|
||||||
|
uses: cirrus-actions/rebase@b87d48154a87a85666003575337e27b8cd65f691 # 1.8
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.COMMAND_BOT_PAT }}
|
||||||
|
|
||||||
|
- name: Add reaction on failure
|
||||||
|
uses: peter-evans/create-or-update-comment@ca08ebd5dc95aa0cd97021e9708fcd6b87138c9b # v3.0.1
|
||||||
|
if: failure()
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.COMMAND_BOT_PAT }}
|
||||||
|
repository: ${{ github.event.repository.full_name }}
|
||||||
|
comment-id: ${{ github.event.comment.id }}
|
||||||
|
reaction-type: "-1"
|
||||||
2
.github/workflows/update-sh.yml
vendored
2
.github/workflows/update-sh.yml
vendored
@ -5,7 +5,7 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '15 18 * * *'
|
- cron: '15 0 * * *'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
||||||
FROM php:8.3-apache-trixie
|
FROM php:8.2-apache-bookworm
|
||||||
|
|
||||||
# entrypoint.sh and cron.sh dependencies
|
# entrypoint.sh and cron.sh dependencies
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
@ -9,10 +9,10 @@ RUN set -ex; \
|
|||||||
busybox-static \
|
busybox-static \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
libldap-common \
|
libldap-common \
|
||||||
libmagickcore-7.q16-10-extra \
|
libmagickcore-6.q16-6-extra \
|
||||||
rsync \
|
rsync \
|
||||||
; \
|
; \
|
||||||
apt-get dist-clean; \
|
rm -rf /var/lib/apt/lists/*; \
|
||||||
\
|
\
|
||||||
mkdir -p /var/spool/cron/crontabs; \
|
mkdir -p /var/spool/cron/crontabs; \
|
||||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||||
@ -21,7 +21,6 @@ RUN set -ex; \
|
|||||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||||
ENV PHP_MEMORY_LIMIT 512M
|
ENV PHP_MEMORY_LIMIT 512M
|
||||||
ENV PHP_UPLOAD_LIMIT 512M
|
ENV PHP_UPLOAD_LIMIT 512M
|
||||||
ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
\
|
\
|
||||||
savedAptMark="$(apt-mark showmanual)"; \
|
savedAptMark="$(apt-mark showmanual)"; \
|
||||||
@ -35,8 +34,8 @@ RUN set -ex; \
|
|||||||
libicu-dev \
|
libicu-dev \
|
||||||
libjpeg-dev \
|
libjpeg-dev \
|
||||||
libldap2-dev \
|
libldap2-dev \
|
||||||
liblz4-dev \
|
|
||||||
libmagickwand-dev \
|
libmagickwand-dev \
|
||||||
|
libmcrypt-dev \
|
||||||
libmemcached-dev \
|
libmemcached-dev \
|
||||||
libpng-dev \
|
libpng-dev \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
@ -57,6 +56,7 @@ RUN set -ex; \
|
|||||||
gmp \
|
gmp \
|
||||||
intl \
|
intl \
|
||||||
ldap \
|
ldap \
|
||||||
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
pdo_pgsql \
|
pdo_pgsql \
|
||||||
@ -65,17 +65,13 @@ RUN set -ex; \
|
|||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.28; \
|
pecl install APCu-5.1.23; \
|
||||||
pecl install igbinary-3.2.16; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install imagick-3.8.1; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
|
pecl install redis-6.0.2; \
|
||||||
memcached-3.4.0; \
|
|
||||||
pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
|
|
||||||
redis-6.3.0; \
|
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
igbinary \
|
|
||||||
imagick \
|
imagick \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
@ -88,14 +84,13 @@ RUN set -ex; \
|
|||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
|
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt dpkg-query --search \
|
| xargs -r dpkg-query --search \
|
||||||
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
|
| cut -d: -f1 \
|
||||||
| awk 'sub(":$", "", $1) { print $1 }' \
|
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
apt-get dist-clean
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
||||||
@ -103,20 +98,15 @@ RUN { \
|
|||||||
echo 'opcache.enable=1'; \
|
echo 'opcache.enable=1'; \
|
||||||
echo 'opcache.interned_strings_buffer=32'; \
|
echo 'opcache.interned_strings_buffer=32'; \
|
||||||
echo 'opcache.max_accelerated_files=10000'; \
|
echo 'opcache.max_accelerated_files=10000'; \
|
||||||
echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
|
echo 'opcache.memory_consumption=128'; \
|
||||||
echo 'opcache.save_comments=1'; \
|
echo 'opcache.save_comments=1'; \
|
||||||
echo 'opcache.revalidate_freq=60'; \
|
echo 'opcache.revalidate_freq=60'; \
|
||||||
echo 'opcache.jit=1255'; \
|
echo 'opcache.jit=1255'; \
|
||||||
echo 'opcache.jit_buffer_size=8M'; \
|
echo 'opcache.jit_buffer_size=128M'; \
|
||||||
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
||||||
\
|
\
|
||||||
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
||||||
\
|
\
|
||||||
{ \
|
|
||||||
echo 'apc.serializer=igbinary'; \
|
|
||||||
echo 'session.serialize_handler=igbinary'; \
|
|
||||||
} >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \
|
|
||||||
\
|
|
||||||
{ \
|
{ \
|
||||||
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
@ -150,7 +140,7 @@ RUN { \
|
|||||||
} > /etc/apache2/conf-available/apache-limits.conf; \
|
} > /etc/apache2/conf-available/apache-limits.conf; \
|
||||||
a2enconf apache-limits
|
a2enconf apache-limits
|
||||||
|
|
||||||
ENV NEXTCLOUD_VERSION 32.0.3
|
ENV NEXTCLOUD_VERSION 27.1.11
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
fetchDeps=" \
|
fetchDeps=" \
|
||||||
@ -160,8 +150,8 @@ RUN set -ex; \
|
|||||||
apt-get update; \
|
apt-get update; \
|
||||||
apt-get install -y --no-install-recommends $fetchDeps; \
|
apt-get install -y --no-install-recommends $fetchDeps; \
|
||||||
\
|
\
|
||||||
curl -fsSL -o nextcloud.tar.bz2 "https://github.com/nextcloud-releases/server/releases/download/v32.0.3/nextcloud-32.0.3.tar.bz2"; \
|
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2.asc "https://github.com/nextcloud-releases/server/releases/download/v32.0.3/nextcloud-32.0.3.tar.bz2.asc"; \
|
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
# gpg key from https://nextcloud.com/nextcloud.asc
|
# gpg key from https://nextcloud.com/nextcloud.asc
|
||||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
||||||
@ -175,7 +165,7 @@ RUN set -ex; \
|
|||||||
chmod +x /usr/src/nextcloud/occ; \
|
chmod +x /usr/src/nextcloud/occ; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
|
||||||
apt-get dist-clean
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY *.sh upgrade.exclude /
|
COPY *.sh upgrade.exclude /
|
||||||
COPY config/* /usr/src/nextcloud/config/
|
COPY config/* /usr/src/nextcloud/config/
|
||||||
@ -14,8 +14,4 @@ if (getenv('REDIS_HOST')) {
|
|||||||
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
||||||
$CONFIG['redis']['port'] = 6379;
|
$CONFIG['redis']['port'] = 6379;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getenv('REDIS_HOST_USER') !== false) {
|
|
||||||
$CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -28,8 +28,3 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
|
|||||||
if ($trustedProxies) {
|
if ($trustedProxies) {
|
||||||
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
||||||
}
|
}
|
||||||
|
|
||||||
$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
|
|
||||||
if ($forwardedForHeaders) {
|
|
||||||
$CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
|
|
||||||
}
|
|
||||||
@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
|||||||
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
||||||
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
||||||
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
||||||
'autocreate' => strtolower($autocreate) !== 'false',
|
'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
|
||||||
'use_ssl' => strtolower($use_ssl) !== 'false',
|
'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
|
||||||
// required for some non Amazon S3 implementations
|
// required for some non Amazon S3 implementations
|
||||||
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
||||||
// required for older protocol versions
|
// required for older protocol versions
|
||||||
@ -23,39 +23,32 @@ run_as() {
|
|||||||
run_path() {
|
run_path() {
|
||||||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||||
local return_code=0
|
local return_code=0
|
||||||
local found=0
|
|
||||||
|
|
||||||
echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
|
if ! [ -d "${hook_folder_path}" ]; then
|
||||||
|
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||||
if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
|
|
||||||
echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
|
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
|
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||||
while read -r script_file_path; do
|
|
||||||
|
(
|
||||||
|
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
|
||||||
if ! [ -x "${script_file_path}" ]; then
|
if ! [ -x "${script_file_path}" ]; then
|
||||||
echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
|
echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
|
||||||
found=$((found-1))
|
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
||||||
found=$((found+1))
|
|
||||||
run_as "${script_file_path}" || return_code="$?"
|
run_as "${script_file_path}" || return_code="$?"
|
||||||
|
|
||||||
if [ "${return_code}" -ne "0" ]; then
|
if [ "${return_code}" -ne "0" ]; then
|
||||||
echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
|
echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Finished executing the script: \"${script_file_path}\""
|
echo "==> Finished the script: \"${script_file_path}\""
|
||||||
done
|
done
|
||||||
if [ "$found" -lt "1" ]; then
|
|
||||||
echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
|
|
||||||
else
|
|
||||||
echo "=> Completed executing scripts in the \"$1\" folder"
|
|
||||||
fi
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,21 +114,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
@ -252,14 +237,12 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
fi
|
fi
|
||||||
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
||||||
echo "Setting trusted domains…"
|
echo "Setting trusted domains…"
|
||||||
set -f # turn off glob
|
|
||||||
NC_TRUSTED_DOMAIN_IDX=1
|
NC_TRUSTED_DOMAIN_IDX=1
|
||||||
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
|
for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
|
||||||
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
||||||
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
|
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
|
||||||
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
||||||
done
|
done
|
||||||
set +f # turn glob back on
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run_path post-installation
|
run_path post-installation
|
||||||
@ -297,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
|
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
|
||||||
FROM php:8.3-fpm-alpine3.23
|
FROM php:8.2-fpm-alpine3.20
|
||||||
|
|
||||||
# entrypoint.sh and cron.sh dependencies
|
# entrypoint.sh and cron.sh dependencies
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
@ -32,6 +32,7 @@ RUN set -ex; \
|
|||||||
imagemagick-dev \
|
imagemagick-dev \
|
||||||
libevent-dev \
|
libevent-dev \
|
||||||
libjpeg-turbo-dev \
|
libjpeg-turbo-dev \
|
||||||
|
libmcrypt-dev \
|
||||||
libmemcached-dev \
|
libmemcached-dev \
|
||||||
libpng-dev \
|
libpng-dev \
|
||||||
libwebp-dev \
|
libwebp-dev \
|
||||||
@ -53,6 +54,7 @@ RUN set -ex; \
|
|||||||
gmp \
|
gmp \
|
||||||
intl \
|
intl \
|
||||||
ldap \
|
ldap \
|
||||||
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
pdo_pgsql \
|
pdo_pgsql \
|
||||||
@ -61,17 +63,13 @@ RUN set -ex; \
|
|||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.28; \
|
pecl install APCu-5.1.23; \
|
||||||
pecl install igbinary-3.2.16; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install imagick-3.8.1; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
|
pecl install redis-6.0.2; \
|
||||||
memcached-3.4.0; \
|
|
||||||
pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
|
|
||||||
redis-6.3.0; \
|
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
igbinary \
|
|
||||||
imagick \
|
imagick \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
@ -91,25 +89,19 @@ RUN set -ex; \
|
|||||||
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
||||||
ENV PHP_MEMORY_LIMIT 512M
|
ENV PHP_MEMORY_LIMIT 512M
|
||||||
ENV PHP_UPLOAD_LIMIT 512M
|
ENV PHP_UPLOAD_LIMIT 512M
|
||||||
ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
|
|
||||||
RUN { \
|
RUN { \
|
||||||
echo 'opcache.enable=1'; \
|
echo 'opcache.enable=1'; \
|
||||||
echo 'opcache.interned_strings_buffer=32'; \
|
echo 'opcache.interned_strings_buffer=32'; \
|
||||||
echo 'opcache.max_accelerated_files=10000'; \
|
echo 'opcache.max_accelerated_files=10000'; \
|
||||||
echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
|
echo 'opcache.memory_consumption=128'; \
|
||||||
echo 'opcache.save_comments=1'; \
|
echo 'opcache.save_comments=1'; \
|
||||||
echo 'opcache.revalidate_freq=60'; \
|
echo 'opcache.revalidate_freq=60'; \
|
||||||
echo 'opcache.jit=1255'; \
|
echo 'opcache.jit=1255'; \
|
||||||
echo 'opcache.jit_buffer_size=8M'; \
|
echo 'opcache.jit_buffer_size=128M'; \
|
||||||
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
||||||
\
|
\
|
||||||
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
||||||
\
|
\
|
||||||
{ \
|
|
||||||
echo 'apc.serializer=igbinary'; \
|
|
||||||
echo 'session.serialize_handler=igbinary'; \
|
|
||||||
} >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \
|
|
||||||
\
|
|
||||||
{ \
|
{ \
|
||||||
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
@ -128,7 +120,7 @@ RUN { \
|
|||||||
VOLUME /var/www/html
|
VOLUME /var/www/html
|
||||||
|
|
||||||
|
|
||||||
ENV NEXTCLOUD_VERSION 32.0.3
|
ENV NEXTCLOUD_VERSION 27.1.11
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
apk add --no-cache --virtual .fetch-deps \
|
apk add --no-cache --virtual .fetch-deps \
|
||||||
@ -136,8 +128,8 @@ RUN set -ex; \
|
|||||||
gnupg \
|
gnupg \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
curl -fsSL -o nextcloud.tar.bz2 "https://github.com/nextcloud-releases/server/releases/download/v32.0.3/nextcloud-32.0.3.tar.bz2"; \
|
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2.asc "https://github.com/nextcloud-releases/server/releases/download/v32.0.3/nextcloud-32.0.3.tar.bz2.asc"; \
|
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
# gpg key from https://nextcloud.com/nextcloud.asc
|
# gpg key from https://nextcloud.com/nextcloud.asc
|
||||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
||||||
@ -14,8 +14,4 @@ if (getenv('REDIS_HOST')) {
|
|||||||
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
||||||
$CONFIG['redis']['port'] = 6379;
|
$CONFIG['redis']['port'] = 6379;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getenv('REDIS_HOST_USER') !== false) {
|
|
||||||
$CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -28,8 +28,3 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
|
|||||||
if ($trustedProxies) {
|
if ($trustedProxies) {
|
||||||
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
||||||
}
|
}
|
||||||
|
|
||||||
$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
|
|
||||||
if ($forwardedForHeaders) {
|
|
||||||
$CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
|
|
||||||
}
|
|
||||||
@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
|||||||
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
||||||
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
||||||
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
||||||
'autocreate' => strtolower($autocreate) !== 'false',
|
'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
|
||||||
'use_ssl' => strtolower($use_ssl) !== 'false',
|
'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
|
||||||
// required for some non Amazon S3 implementations
|
// required for some non Amazon S3 implementations
|
||||||
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
||||||
// required for older protocol versions
|
// required for older protocol versions
|
||||||
@ -23,39 +23,32 @@ run_as() {
|
|||||||
run_path() {
|
run_path() {
|
||||||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||||
local return_code=0
|
local return_code=0
|
||||||
local found=0
|
|
||||||
|
|
||||||
echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
|
if ! [ -d "${hook_folder_path}" ]; then
|
||||||
|
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||||
if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
|
|
||||||
echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
|
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
|
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||||
while read -r script_file_path; do
|
|
||||||
|
(
|
||||||
|
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
|
||||||
if ! [ -x "${script_file_path}" ]; then
|
if ! [ -x "${script_file_path}" ]; then
|
||||||
echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
|
echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
|
||||||
found=$((found-1))
|
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
||||||
found=$((found+1))
|
|
||||||
run_as "${script_file_path}" || return_code="$?"
|
run_as "${script_file_path}" || return_code="$?"
|
||||||
|
|
||||||
if [ "${return_code}" -ne "0" ]; then
|
if [ "${return_code}" -ne "0" ]; then
|
||||||
echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
|
echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Finished executing the script: \"${script_file_path}\""
|
echo "==> Finished the script: \"${script_file_path}\""
|
||||||
done
|
done
|
||||||
if [ "$found" -lt "1" ]; then
|
|
||||||
echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
|
|
||||||
else
|
|
||||||
echo "=> Completed executing scripts in the \"$1\" folder"
|
|
||||||
fi
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,21 +114,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
@ -252,14 +237,12 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
fi
|
fi
|
||||||
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
||||||
echo "Setting trusted domains…"
|
echo "Setting trusted domains…"
|
||||||
set -f # turn off glob
|
|
||||||
NC_TRUSTED_DOMAIN_IDX=1
|
NC_TRUSTED_DOMAIN_IDX=1
|
||||||
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
|
for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
|
||||||
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
||||||
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
|
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
|
||||||
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
||||||
done
|
done
|
||||||
set +f # turn glob back on
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run_path post-installation
|
run_path post-installation
|
||||||
@ -297,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
||||||
FROM php:8.3-fpm-trixie
|
FROM php:8.2-fpm-bookworm
|
||||||
|
|
||||||
# entrypoint.sh and cron.sh dependencies
|
# entrypoint.sh and cron.sh dependencies
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
@ -9,10 +9,10 @@ RUN set -ex; \
|
|||||||
busybox-static \
|
busybox-static \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
libldap-common \
|
libldap-common \
|
||||||
libmagickcore-7.q16-10-extra \
|
libmagickcore-6.q16-6-extra \
|
||||||
rsync \
|
rsync \
|
||||||
; \
|
; \
|
||||||
apt-get dist-clean; \
|
rm -rf /var/lib/apt/lists/*; \
|
||||||
\
|
\
|
||||||
mkdir -p /var/spool/cron/crontabs; \
|
mkdir -p /var/spool/cron/crontabs; \
|
||||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||||
@ -21,7 +21,6 @@ RUN set -ex; \
|
|||||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||||
ENV PHP_MEMORY_LIMIT 512M
|
ENV PHP_MEMORY_LIMIT 512M
|
||||||
ENV PHP_UPLOAD_LIMIT 512M
|
ENV PHP_UPLOAD_LIMIT 512M
|
||||||
ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
\
|
\
|
||||||
savedAptMark="$(apt-mark showmanual)"; \
|
savedAptMark="$(apt-mark showmanual)"; \
|
||||||
@ -35,8 +34,8 @@ RUN set -ex; \
|
|||||||
libicu-dev \
|
libicu-dev \
|
||||||
libjpeg-dev \
|
libjpeg-dev \
|
||||||
libldap2-dev \
|
libldap2-dev \
|
||||||
liblz4-dev \
|
|
||||||
libmagickwand-dev \
|
libmagickwand-dev \
|
||||||
|
libmcrypt-dev \
|
||||||
libmemcached-dev \
|
libmemcached-dev \
|
||||||
libpng-dev \
|
libpng-dev \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
@ -57,6 +56,7 @@ RUN set -ex; \
|
|||||||
gmp \
|
gmp \
|
||||||
intl \
|
intl \
|
||||||
ldap \
|
ldap \
|
||||||
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
pdo_pgsql \
|
pdo_pgsql \
|
||||||
@ -65,17 +65,13 @@ RUN set -ex; \
|
|||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.28; \
|
pecl install APCu-5.1.23; \
|
||||||
pecl install igbinary-3.2.16; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install imagick-3.8.1; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
|
pecl install redis-6.0.2; \
|
||||||
memcached-3.4.0; \
|
|
||||||
pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
|
|
||||||
redis-6.3.0; \
|
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
igbinary \
|
|
||||||
imagick \
|
imagick \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
@ -88,14 +84,13 @@ RUN set -ex; \
|
|||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
|
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt dpkg-query --search \
|
| xargs -r dpkg-query --search \
|
||||||
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
|
| cut -d: -f1 \
|
||||||
| awk 'sub(":$", "", $1) { print $1 }' \
|
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
apt-get dist-clean
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
||||||
@ -103,20 +98,15 @@ RUN { \
|
|||||||
echo 'opcache.enable=1'; \
|
echo 'opcache.enable=1'; \
|
||||||
echo 'opcache.interned_strings_buffer=32'; \
|
echo 'opcache.interned_strings_buffer=32'; \
|
||||||
echo 'opcache.max_accelerated_files=10000'; \
|
echo 'opcache.max_accelerated_files=10000'; \
|
||||||
echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
|
echo 'opcache.memory_consumption=128'; \
|
||||||
echo 'opcache.save_comments=1'; \
|
echo 'opcache.save_comments=1'; \
|
||||||
echo 'opcache.revalidate_freq=60'; \
|
echo 'opcache.revalidate_freq=60'; \
|
||||||
echo 'opcache.jit=1255'; \
|
echo 'opcache.jit=1255'; \
|
||||||
echo 'opcache.jit_buffer_size=8M'; \
|
echo 'opcache.jit_buffer_size=128M'; \
|
||||||
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
||||||
\
|
\
|
||||||
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
||||||
\
|
\
|
||||||
{ \
|
|
||||||
echo 'apc.serializer=igbinary'; \
|
|
||||||
echo 'session.serialize_handler=igbinary'; \
|
|
||||||
} >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \
|
|
||||||
\
|
|
||||||
{ \
|
{ \
|
||||||
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
@ -135,7 +125,7 @@ RUN { \
|
|||||||
VOLUME /var/www/html
|
VOLUME /var/www/html
|
||||||
|
|
||||||
|
|
||||||
ENV NEXTCLOUD_VERSION 32.0.3
|
ENV NEXTCLOUD_VERSION 27.1.11
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
fetchDeps=" \
|
fetchDeps=" \
|
||||||
@ -145,8 +135,8 @@ RUN set -ex; \
|
|||||||
apt-get update; \
|
apt-get update; \
|
||||||
apt-get install -y --no-install-recommends $fetchDeps; \
|
apt-get install -y --no-install-recommends $fetchDeps; \
|
||||||
\
|
\
|
||||||
curl -fsSL -o nextcloud.tar.bz2 "https://github.com/nextcloud-releases/server/releases/download/v32.0.3/nextcloud-32.0.3.tar.bz2"; \
|
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2"; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2.asc "https://github.com/nextcloud-releases/server/releases/download/v32.0.3/nextcloud-32.0.3.tar.bz2.asc"; \
|
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-27.1.11.tar.bz2.asc"; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
# gpg key from https://nextcloud.com/nextcloud.asc
|
# gpg key from https://nextcloud.com/nextcloud.asc
|
||||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
||||||
@ -160,7 +150,7 @@ RUN set -ex; \
|
|||||||
chmod +x /usr/src/nextcloud/occ; \
|
chmod +x /usr/src/nextcloud/occ; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
|
||||||
apt-get dist-clean
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY *.sh upgrade.exclude /
|
COPY *.sh upgrade.exclude /
|
||||||
COPY config/* /usr/src/nextcloud/config/
|
COPY config/* /usr/src/nextcloud/config/
|
||||||
@ -14,8 +14,4 @@ if (getenv('REDIS_HOST')) {
|
|||||||
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
||||||
$CONFIG['redis']['port'] = 6379;
|
$CONFIG['redis']['port'] = 6379;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getenv('REDIS_HOST_USER') !== false) {
|
|
||||||
$CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -28,8 +28,3 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
|
|||||||
if ($trustedProxies) {
|
if ($trustedProxies) {
|
||||||
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
||||||
}
|
}
|
||||||
|
|
||||||
$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
|
|
||||||
if ($forwardedForHeaders) {
|
|
||||||
$CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
|
|
||||||
}
|
|
||||||
@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
|||||||
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
||||||
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
||||||
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
||||||
'autocreate' => strtolower($autocreate) !== 'false',
|
'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
|
||||||
'use_ssl' => strtolower($use_ssl) !== 'false',
|
'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
|
||||||
// required for some non Amazon S3 implementations
|
// required for some non Amazon S3 implementations
|
||||||
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
||||||
// required for older protocol versions
|
// required for older protocol versions
|
||||||
@ -23,39 +23,32 @@ run_as() {
|
|||||||
run_path() {
|
run_path() {
|
||||||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||||
local return_code=0
|
local return_code=0
|
||||||
local found=0
|
|
||||||
|
|
||||||
echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
|
if ! [ -d "${hook_folder_path}" ]; then
|
||||||
|
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||||
if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
|
|
||||||
echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
|
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
|
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||||
while read -r script_file_path; do
|
|
||||||
|
(
|
||||||
|
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
|
||||||
if ! [ -x "${script_file_path}" ]; then
|
if ! [ -x "${script_file_path}" ]; then
|
||||||
echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
|
echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
|
||||||
found=$((found-1))
|
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
||||||
found=$((found+1))
|
|
||||||
run_as "${script_file_path}" || return_code="$?"
|
run_as "${script_file_path}" || return_code="$?"
|
||||||
|
|
||||||
if [ "${return_code}" -ne "0" ]; then
|
if [ "${return_code}" -ne "0" ]; then
|
||||||
echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
|
echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Finished executing the script: \"${script_file_path}\""
|
echo "==> Finished the script: \"${script_file_path}\""
|
||||||
done
|
done
|
||||||
if [ "$found" -lt "1" ]; then
|
|
||||||
echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
|
|
||||||
else
|
|
||||||
echo "=> Completed executing scripts in the \"$1\" folder"
|
|
||||||
fi
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,21 +114,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
@ -252,14 +237,12 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
fi
|
fi
|
||||||
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
||||||
echo "Setting trusted domains…"
|
echo "Setting trusted domains…"
|
||||||
set -f # turn off glob
|
|
||||||
NC_TRUSTED_DOMAIN_IDX=1
|
NC_TRUSTED_DOMAIN_IDX=1
|
||||||
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
|
for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
|
||||||
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
||||||
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
|
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
|
||||||
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
||||||
done
|
done
|
||||||
set +f # turn glob back on
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run_path post-installation
|
run_path post-installation
|
||||||
@ -297,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
||||||
FROM php:8.3-apache-trixie
|
FROM php:8.2-apache-bookworm
|
||||||
|
|
||||||
# entrypoint.sh and cron.sh dependencies
|
# entrypoint.sh and cron.sh dependencies
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
@ -9,10 +9,10 @@ RUN set -ex; \
|
|||||||
busybox-static \
|
busybox-static \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
libldap-common \
|
libldap-common \
|
||||||
libmagickcore-7.q16-10-extra \
|
libmagickcore-6.q16-6-extra \
|
||||||
rsync \
|
rsync \
|
||||||
; \
|
; \
|
||||||
apt-get dist-clean; \
|
rm -rf /var/lib/apt/lists/*; \
|
||||||
\
|
\
|
||||||
mkdir -p /var/spool/cron/crontabs; \
|
mkdir -p /var/spool/cron/crontabs; \
|
||||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||||
@ -21,7 +21,6 @@ RUN set -ex; \
|
|||||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||||
ENV PHP_MEMORY_LIMIT 512M
|
ENV PHP_MEMORY_LIMIT 512M
|
||||||
ENV PHP_UPLOAD_LIMIT 512M
|
ENV PHP_UPLOAD_LIMIT 512M
|
||||||
ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
\
|
\
|
||||||
savedAptMark="$(apt-mark showmanual)"; \
|
savedAptMark="$(apt-mark showmanual)"; \
|
||||||
@ -35,8 +34,8 @@ RUN set -ex; \
|
|||||||
libicu-dev \
|
libicu-dev \
|
||||||
libjpeg-dev \
|
libjpeg-dev \
|
||||||
libldap2-dev \
|
libldap2-dev \
|
||||||
liblz4-dev \
|
|
||||||
libmagickwand-dev \
|
libmagickwand-dev \
|
||||||
|
libmcrypt-dev \
|
||||||
libmemcached-dev \
|
libmemcached-dev \
|
||||||
libpng-dev \
|
libpng-dev \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
@ -57,6 +56,7 @@ RUN set -ex; \
|
|||||||
gmp \
|
gmp \
|
||||||
intl \
|
intl \
|
||||||
ldap \
|
ldap \
|
||||||
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
pdo_pgsql \
|
pdo_pgsql \
|
||||||
@ -65,17 +65,13 @@ RUN set -ex; \
|
|||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.28; \
|
pecl install APCu-5.1.23; \
|
||||||
pecl install igbinary-3.2.16; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install imagick-3.8.1; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
|
pecl install redis-6.0.2; \
|
||||||
memcached-3.4.0; \
|
|
||||||
pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
|
|
||||||
redis-6.3.0; \
|
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
igbinary \
|
|
||||||
imagick \
|
imagick \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
@ -88,14 +84,13 @@ RUN set -ex; \
|
|||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
|
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt dpkg-query --search \
|
| xargs -r dpkg-query --search \
|
||||||
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
|
| cut -d: -f1 \
|
||||||
| awk 'sub(":$", "", $1) { print $1 }' \
|
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
apt-get dist-clean
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
||||||
@ -103,20 +98,15 @@ RUN { \
|
|||||||
echo 'opcache.enable=1'; \
|
echo 'opcache.enable=1'; \
|
||||||
echo 'opcache.interned_strings_buffer=32'; \
|
echo 'opcache.interned_strings_buffer=32'; \
|
||||||
echo 'opcache.max_accelerated_files=10000'; \
|
echo 'opcache.max_accelerated_files=10000'; \
|
||||||
echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
|
echo 'opcache.memory_consumption=128'; \
|
||||||
echo 'opcache.save_comments=1'; \
|
echo 'opcache.save_comments=1'; \
|
||||||
echo 'opcache.revalidate_freq=60'; \
|
echo 'opcache.revalidate_freq=60'; \
|
||||||
echo 'opcache.jit=1255'; \
|
echo 'opcache.jit=1255'; \
|
||||||
echo 'opcache.jit_buffer_size=8M'; \
|
echo 'opcache.jit_buffer_size=128M'; \
|
||||||
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
||||||
\
|
\
|
||||||
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
||||||
\
|
\
|
||||||
{ \
|
|
||||||
echo 'apc.serializer=igbinary'; \
|
|
||||||
echo 'session.serialize_handler=igbinary'; \
|
|
||||||
} >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \
|
|
||||||
\
|
|
||||||
{ \
|
{ \
|
||||||
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
@ -150,7 +140,7 @@ RUN { \
|
|||||||
} > /etc/apache2/conf-available/apache-limits.conf; \
|
} > /etc/apache2/conf-available/apache-limits.conf; \
|
||||||
a2enconf apache-limits
|
a2enconf apache-limits
|
||||||
|
|
||||||
ENV NEXTCLOUD_VERSION 31.0.12
|
ENV NEXTCLOUD_VERSION 28.0.8
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
fetchDeps=" \
|
fetchDeps=" \
|
||||||
@ -160,8 +150,8 @@ RUN set -ex; \
|
|||||||
apt-get update; \
|
apt-get update; \
|
||||||
apt-get install -y --no-install-recommends $fetchDeps; \
|
apt-get install -y --no-install-recommends $fetchDeps; \
|
||||||
\
|
\
|
||||||
curl -fsSL -o nextcloud.tar.bz2 "https://github.com/nextcloud-releases/server/releases/download/v31.0.12/nextcloud-31.0.12.tar.bz2"; \
|
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2"; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2.asc "https://github.com/nextcloud-releases/server/releases/download/v31.0.12/nextcloud-31.0.12.tar.bz2.asc"; \
|
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2.asc"; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
# gpg key from https://nextcloud.com/nextcloud.asc
|
# gpg key from https://nextcloud.com/nextcloud.asc
|
||||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
||||||
@ -175,7 +165,7 @@ RUN set -ex; \
|
|||||||
chmod +x /usr/src/nextcloud/occ; \
|
chmod +x /usr/src/nextcloud/occ; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
|
||||||
apt-get dist-clean
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY *.sh upgrade.exclude /
|
COPY *.sh upgrade.exclude /
|
||||||
COPY config/* /usr/src/nextcloud/config/
|
COPY config/* /usr/src/nextcloud/config/
|
||||||
@ -14,8 +14,4 @@ if (getenv('REDIS_HOST')) {
|
|||||||
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
||||||
$CONFIG['redis']['port'] = 6379;
|
$CONFIG['redis']['port'] = 6379;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getenv('REDIS_HOST_USER') !== false) {
|
|
||||||
$CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -28,8 +28,3 @@ $trustedProxies = getenv('TRUSTED_PROXIES');
|
|||||||
if ($trustedProxies) {
|
if ($trustedProxies) {
|
||||||
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
||||||
}
|
}
|
||||||
|
|
||||||
$forwardedForHeaders = getenv('FORWARDED_FOR_HEADERS');
|
|
||||||
if ($forwardedForHeaders) {
|
|
||||||
$CONFIG['forwarded_for_headers'] = array_filter(array_map('trim', explode(' ', $forwardedForHeaders)));
|
|
||||||
}
|
|
||||||
@ -14,8 +14,8 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
|||||||
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
||||||
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
||||||
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
||||||
'autocreate' => strtolower($autocreate) !== 'false',
|
'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
|
||||||
'use_ssl' => strtolower($use_ssl) !== 'false',
|
'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
|
||||||
// required for some non Amazon S3 implementations
|
// required for some non Amazon S3 implementations
|
||||||
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
||||||
// required for older protocol versions
|
// required for older protocol versions
|
||||||
@ -23,39 +23,32 @@ run_as() {
|
|||||||
run_path() {
|
run_path() {
|
||||||
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||||
local return_code=0
|
local return_code=0
|
||||||
local found=0
|
|
||||||
|
|
||||||
echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
|
if ! [ -d "${hook_folder_path}" ]; then
|
||||||
|
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||||
if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
|
|
||||||
echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
|
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
|
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||||
while read -r script_file_path; do
|
|
||||||
|
(
|
||||||
|
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
|
||||||
if ! [ -x "${script_file_path}" ]; then
|
if ! [ -x "${script_file_path}" ]; then
|
||||||
echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
|
echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
|
||||||
found=$((found-1))
|
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
||||||
found=$((found+1))
|
|
||||||
run_as "${script_file_path}" || return_code="$?"
|
run_as "${script_file_path}" || return_code="$?"
|
||||||
|
|
||||||
if [ "${return_code}" -ne "0" ]; then
|
if [ "${return_code}" -ne "0" ]; then
|
||||||
echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
|
echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "==> Finished executing the script: \"${script_file_path}\""
|
echo "==> Finished the script: \"${script_file_path}\""
|
||||||
done
|
done
|
||||||
if [ "$found" -lt "1" ]; then
|
|
||||||
echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
|
|
||||||
else
|
|
||||||
echo "=> Completed executing scripts in the \"$1\" folder"
|
|
||||||
fi
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -121,21 +114,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
# check if redis host is an unix socket path
|
# check if redis host is an unix socket path
|
||||||
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
fi
|
fi
|
||||||
# check if redis password has been set
|
# check if redis password has been set
|
||||||
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
if [ -n "${REDIS_HOST_USER+x}" ]; then
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
|
|
||||||
else
|
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
fi
|
fi
|
||||||
@ -252,14 +237,12 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
fi
|
fi
|
||||||
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
||||||
echo "Setting trusted domains…"
|
echo "Setting trusted domains…"
|
||||||
set -f # turn off glob
|
|
||||||
NC_TRUSTED_DOMAIN_IDX=1
|
NC_TRUSTED_DOMAIN_IDX=1
|
||||||
for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
|
for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
|
||||||
DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
||||||
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
|
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
|
||||||
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
||||||
done
|
done
|
||||||
set +f # turn glob back on
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
run_path post-installation
|
run_path post-installation
|
||||||
@ -297,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
|
|||||||
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
cfgFile=$(basename "$cfgPath")
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
|
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||||
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
fi
|
fi
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
|
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
|
||||||
FROM php:8.3-fpm-alpine3.23
|
FROM php:8.2-fpm-alpine3.20
|
||||||
|
|
||||||
# entrypoint.sh and cron.sh dependencies
|
# entrypoint.sh and cron.sh dependencies
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
@ -32,6 +32,7 @@ RUN set -ex; \
|
|||||||
imagemagick-dev \
|
imagemagick-dev \
|
||||||
libevent-dev \
|
libevent-dev \
|
||||||
libjpeg-turbo-dev \
|
libjpeg-turbo-dev \
|
||||||
|
libmcrypt-dev \
|
||||||
libmemcached-dev \
|
libmemcached-dev \
|
||||||
libpng-dev \
|
libpng-dev \
|
||||||
libwebp-dev \
|
libwebp-dev \
|
||||||
@ -53,6 +54,7 @@ RUN set -ex; \
|
|||||||
gmp \
|
gmp \
|
||||||
intl \
|
intl \
|
||||||
ldap \
|
ldap \
|
||||||
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
pdo_pgsql \
|
pdo_pgsql \
|
||||||
@ -61,17 +63,13 @@ RUN set -ex; \
|
|||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.28; \
|
pecl install APCu-5.1.23; \
|
||||||
pecl install igbinary-3.2.16; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install imagick-3.8.1; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
|
pecl install redis-6.0.2; \
|
||||||
memcached-3.4.0; \
|
|
||||||
pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
|
|
||||||
redis-6.3.0; \
|
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
igbinary \
|
|
||||||
imagick \
|
imagick \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
@ -91,25 +89,19 @@ RUN set -ex; \
|
|||||||
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
||||||
ENV PHP_MEMORY_LIMIT 512M
|
ENV PHP_MEMORY_LIMIT 512M
|
||||||
ENV PHP_UPLOAD_LIMIT 512M
|
ENV PHP_UPLOAD_LIMIT 512M
|
||||||
ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
|
|
||||||
RUN { \
|
RUN { \
|
||||||
echo 'opcache.enable=1'; \
|
echo 'opcache.enable=1'; \
|
||||||
echo 'opcache.interned_strings_buffer=32'; \
|
echo 'opcache.interned_strings_buffer=32'; \
|
||||||
echo 'opcache.max_accelerated_files=10000'; \
|
echo 'opcache.max_accelerated_files=10000'; \
|
||||||
echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
|
echo 'opcache.memory_consumption=128'; \
|
||||||
echo 'opcache.save_comments=1'; \
|
echo 'opcache.save_comments=1'; \
|
||||||
echo 'opcache.revalidate_freq=60'; \
|
echo 'opcache.revalidate_freq=60'; \
|
||||||
echo 'opcache.jit=1255'; \
|
echo 'opcache.jit=1255'; \
|
||||||
echo 'opcache.jit_buffer_size=8M'; \
|
echo 'opcache.jit_buffer_size=128M'; \
|
||||||
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
||||||
\
|
\
|
||||||
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
||||||
\
|
\
|
||||||
{ \
|
|
||||||
echo 'apc.serializer=igbinary'; \
|
|
||||||
echo 'session.serialize_handler=igbinary'; \
|
|
||||||
} >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \
|
|
||||||
\
|
|
||||||
{ \
|
{ \
|
||||||
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
@ -128,7 +120,7 @@ RUN { \
|
|||||||
VOLUME /var/www/html
|
VOLUME /var/www/html
|
||||||
|
|
||||||
|
|
||||||
ENV NEXTCLOUD_VERSION 31.0.12
|
ENV NEXTCLOUD_VERSION 28.0.8
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
apk add --no-cache --virtual .fetch-deps \
|
apk add --no-cache --virtual .fetch-deps \
|
||||||
@ -136,8 +128,8 @@ RUN set -ex; \
|
|||||||
gnupg \
|
gnupg \
|
||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
curl -fsSL -o nextcloud.tar.bz2 "https://github.com/nextcloud-releases/server/releases/download/v31.0.12/nextcloud-31.0.12.tar.bz2"; \
|
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2"; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2.asc "https://github.com/nextcloud-releases/server/releases/download/v31.0.12/nextcloud-31.0.12.tar.bz2.asc"; \
|
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2.asc"; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
# gpg key from https://nextcloud.com/nextcloud.asc
|
# gpg key from https://nextcloud.com/nextcloud.asc
|
||||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
||||||
17
28/fpm-alpine/config/redis.config.php
Normal file
17
28/fpm-alpine/config/redis.config.php
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<?php
|
||||||
|
if (getenv('REDIS_HOST')) {
|
||||||
|
$CONFIG = array(
|
||||||
|
'memcache.distributed' => '\OC\Memcache\Redis',
|
||||||
|
'memcache.locking' => '\OC\Memcache\Redis',
|
||||||
|
'redis' => array(
|
||||||
|
'host' => getenv('REDIS_HOST'),
|
||||||
|
'password' => getenv('REDIS_HOST_PASSWORD_FILE') ? trim(file_get_contents(getenv('REDIS_HOST_PASSWORD_FILE'))) : (string) getenv('REDIS_HOST_PASSWORD'),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (getenv('REDIS_HOST_PORT') !== false) {
|
||||||
|
$CONFIG['redis']['port'] = (int) getenv('REDIS_HOST_PORT');
|
||||||
|
} elseif (getenv('REDIS_HOST')[0] != '/') {
|
||||||
|
$CONFIG['redis']['port'] = 6379;
|
||||||
|
}
|
||||||
|
}
|
||||||
30
28/fpm-alpine/config/reverse-proxy.config.php
Normal file
30
28/fpm-alpine/config/reverse-proxy.config.php
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
<?php
|
||||||
|
$overwriteHost = getenv('OVERWRITEHOST');
|
||||||
|
if ($overwriteHost) {
|
||||||
|
$CONFIG['overwritehost'] = $overwriteHost;
|
||||||
|
}
|
||||||
|
|
||||||
|
$overwriteProtocol = getenv('OVERWRITEPROTOCOL');
|
||||||
|
if ($overwriteProtocol) {
|
||||||
|
$CONFIG['overwriteprotocol'] = $overwriteProtocol;
|
||||||
|
}
|
||||||
|
|
||||||
|
$overwriteCliUrl = getenv('OVERWRITECLIURL');
|
||||||
|
if ($overwriteCliUrl) {
|
||||||
|
$CONFIG['overwrite.cli.url'] = $overwriteCliUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
$overwriteWebRoot = getenv('OVERWRITEWEBROOT');
|
||||||
|
if ($overwriteWebRoot) {
|
||||||
|
$CONFIG['overwritewebroot'] = $overwriteWebRoot;
|
||||||
|
}
|
||||||
|
|
||||||
|
$overwriteCondAddr = getenv('OVERWRITECONDADDR');
|
||||||
|
if ($overwriteCondAddr) {
|
||||||
|
$CONFIG['overwritecondaddr'] = $overwriteCondAddr;
|
||||||
|
}
|
||||||
|
|
||||||
|
$trustedProxies = getenv('TRUSTED_PROXIES');
|
||||||
|
if ($trustedProxies) {
|
||||||
|
$CONFIG['trusted_proxies'] = array_filter(array_map('trim', explode(' ', $trustedProxies)));
|
||||||
|
}
|
||||||
48
28/fpm-alpine/config/s3.config.php
Normal file
48
28/fpm-alpine/config/s3.config.php
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
if (getenv('OBJECTSTORE_S3_BUCKET')) {
|
||||||
|
$use_ssl = getenv('OBJECTSTORE_S3_SSL');
|
||||||
|
$use_path = getenv('OBJECTSTORE_S3_USEPATH_STYLE');
|
||||||
|
$use_legacyauth = getenv('OBJECTSTORE_S3_LEGACYAUTH');
|
||||||
|
$autocreate = getenv('OBJECTSTORE_S3_AUTOCREATE');
|
||||||
|
$CONFIG = array(
|
||||||
|
'objectstore' => array(
|
||||||
|
'class' => '\OC\Files\ObjectStore\S3',
|
||||||
|
'arguments' => array(
|
||||||
|
'bucket' => getenv('OBJECTSTORE_S3_BUCKET'),
|
||||||
|
'region' => getenv('OBJECTSTORE_S3_REGION') ?: '',
|
||||||
|
'hostname' => getenv('OBJECTSTORE_S3_HOST') ?: '',
|
||||||
|
'port' => getenv('OBJECTSTORE_S3_PORT') ?: '',
|
||||||
|
'storageClass' => getenv('OBJECTSTORE_S3_STORAGE_CLASS') ?: '',
|
||||||
|
'objectPrefix' => getenv("OBJECTSTORE_S3_OBJECT_PREFIX") ? getenv("OBJECTSTORE_S3_OBJECT_PREFIX") : "urn:oid:",
|
||||||
|
'autocreate' => (strtolower($autocreate) === 'false' || $autocreate == false) ? false : true,
|
||||||
|
'use_ssl' => (strtolower($use_ssl) === 'false' || $use_ssl == false) ? false : true,
|
||||||
|
// required for some non Amazon S3 implementations
|
||||||
|
'use_path_style' => $use_path == true && strtolower($use_path) !== 'false',
|
||||||
|
// required for older protocol versions
|
||||||
|
'legacy_auth' => $use_legacyauth == true && strtolower($use_legacyauth) !== 'false'
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (getenv('OBJECTSTORE_S3_KEY_FILE')) {
|
||||||
|
$CONFIG['objectstore']['arguments']['key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_KEY_FILE')));
|
||||||
|
} elseif (getenv('OBJECTSTORE_S3_KEY')) {
|
||||||
|
$CONFIG['objectstore']['arguments']['key'] = getenv('OBJECTSTORE_S3_KEY');
|
||||||
|
} else {
|
||||||
|
$CONFIG['objectstore']['arguments']['key'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (getenv('OBJECTSTORE_S3_SECRET_FILE')) {
|
||||||
|
$CONFIG['objectstore']['arguments']['secret'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SECRET_FILE')));
|
||||||
|
} elseif (getenv('OBJECTSTORE_S3_SECRET')) {
|
||||||
|
$CONFIG['objectstore']['arguments']['secret'] = getenv('OBJECTSTORE_S3_SECRET');
|
||||||
|
} else {
|
||||||
|
$CONFIG['objectstore']['arguments']['secret'] = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')) {
|
||||||
|
$CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
|
||||||
|
} elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
|
||||||
|
$CONFIG['objectstore']['arguments']['sse_c_key'] = getenv('OBJECTSTORE_S3_SSE_C_KEY');
|
||||||
|
}
|
||||||
|
}
|
||||||
293
28/fpm-alpine/entrypoint.sh
Executable file
293
28/fpm-alpine/entrypoint.sh
Executable file
@ -0,0 +1,293 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
# version_greater A B returns whether A > B
|
||||||
|
version_greater() {
|
||||||
|
[ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
# return true if specified directory is empty
|
||||||
|
directory_empty() {
|
||||||
|
[ -z "$(ls -A "$1/")" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
run_as() {
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
su -p "$user" -s /bin/sh -c "$1"
|
||||||
|
else
|
||||||
|
sh -c "$1"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Execute all executable files in a given directory in alphanumeric order
|
||||||
|
run_path() {
|
||||||
|
local hook_folder_path="/docker-entrypoint-hooks.d/$1"
|
||||||
|
local return_code=0
|
||||||
|
|
||||||
|
if ! [ -d "${hook_folder_path}" ]; then
|
||||||
|
echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
|
||||||
|
|
||||||
|
(
|
||||||
|
find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
|
||||||
|
if ! [ -x "${script_file_path}" ]; then
|
||||||
|
echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
|
||||||
|
|
||||||
|
run_as "${script_file_path}" || return_code="$?"
|
||||||
|
|
||||||
|
if [ "${return_code}" -ne "0" ]; then
|
||||||
|
echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "==> Finished the script: \"${script_file_path}\""
|
||||||
|
done
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
# usage: file_env VAR [DEFAULT]
|
||||||
|
# ie: file_env 'XYZ_DB_PASSWORD' 'example'
|
||||||
|
# (will allow for "$XYZ_DB_PASSWORD_FILE" to fill in the value of
|
||||||
|
# "$XYZ_DB_PASSWORD" from a file, especially for Docker's secrets feature)
|
||||||
|
file_env() {
|
||||||
|
local var="$1"
|
||||||
|
local fileVar="${var}_FILE"
|
||||||
|
local def="${2:-}"
|
||||||
|
local varValue=$(env | grep -E "^${var}=" | sed -E -e "s/^${var}=//")
|
||||||
|
local fileVarValue=$(env | grep -E "^${fileVar}=" | sed -E -e "s/^${fileVar}=//")
|
||||||
|
if [ -n "${varValue}" ] && [ -n "${fileVarValue}" ]; then
|
||||||
|
echo >&2 "error: both $var and $fileVar are set (but are exclusive)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ -n "${varValue}" ]; then
|
||||||
|
export "$var"="${varValue}"
|
||||||
|
elif [ -n "${fileVarValue}" ]; then
|
||||||
|
export "$var"="$(cat "${fileVarValue}")"
|
||||||
|
elif [ -n "${def}" ]; then
|
||||||
|
export "$var"="$def"
|
||||||
|
fi
|
||||||
|
unset "$fileVar"
|
||||||
|
}
|
||||||
|
|
||||||
|
if expr "$1" : "apache" 1>/dev/null; then
|
||||||
|
if [ -n "${APACHE_DISABLE_REWRITE_IP+x}" ]; then
|
||||||
|
a2disconf remoteip
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UPDATE:-0}" -eq 1 ]; then
|
||||||
|
uid="$(id -u)"
|
||||||
|
gid="$(id -g)"
|
||||||
|
if [ "$uid" = '0' ]; then
|
||||||
|
case "$1" in
|
||||||
|
apache2*)
|
||||||
|
user="${APACHE_RUN_USER:-www-data}"
|
||||||
|
group="${APACHE_RUN_GROUP:-www-data}"
|
||||||
|
|
||||||
|
# strip off any '#' symbol ('#1000' is valid syntax for Apache)
|
||||||
|
user="${user#'#'}"
|
||||||
|
group="${group#'#'}"
|
||||||
|
;;
|
||||||
|
*) # php-fpm
|
||||||
|
user='www-data'
|
||||||
|
group='www-data'
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
user="$uid"
|
||||||
|
group="$gid"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "${REDIS_HOST+x}" ]; then
|
||||||
|
|
||||||
|
echo "Configuring Redis as session handler"
|
||||||
|
{
|
||||||
|
file_env REDIS_HOST_PASSWORD
|
||||||
|
echo 'session.save_handler = redis'
|
||||||
|
# check if redis host is an unix socket path
|
||||||
|
if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
|
||||||
|
if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"unix://${REDIS_HOST}\""
|
||||||
|
fi
|
||||||
|
# check if redis password has been set
|
||||||
|
elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
|
||||||
|
else
|
||||||
|
echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
|
||||||
|
fi
|
||||||
|
echo "redis.session.locking_enabled = 1"
|
||||||
|
echo "redis.session.lock_retries = -1"
|
||||||
|
# redis.session.lock_wait_time is specified in microseconds.
|
||||||
|
# Wait 10ms before retrying the lock rather than the default 2ms.
|
||||||
|
echo "redis.session.lock_wait_time = 10000"
|
||||||
|
} > /usr/local/etc/php/conf.d/redis-session.ini
|
||||||
|
fi
|
||||||
|
|
||||||
|
# If another process is syncing the html folder, wait for
|
||||||
|
# it to be done, then escape initalization.
|
||||||
|
(
|
||||||
|
if ! flock -n 9; then
|
||||||
|
# If we couldn't get it immediately, show a message, then wait for real
|
||||||
|
echo "Another process is initializing Nextcloud. Waiting..."
|
||||||
|
flock 9
|
||||||
|
fi
|
||||||
|
|
||||||
|
installed_version="0.0.0.0"
|
||||||
|
if [ -f /var/www/html/version.php ]; then
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
|
||||||
|
fi
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
image_version="$(php -r 'require "/usr/src/nextcloud/version.php"; echo implode(".", $OC_Version);')"
|
||||||
|
|
||||||
|
if version_greater "$installed_version" "$image_version"; then
|
||||||
|
echo "Can't start Nextcloud because the version of the data ($installed_version) is higher than the docker image version ($image_version) and downgrading is not supported. Are you sure you have pulled the newest image version?"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if version_greater "$image_version" "$installed_version"; then
|
||||||
|
echo "Initializing nextcloud $image_version ..."
|
||||||
|
if [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
|
if [ "${image_version%%.*}" -gt "$((${installed_version%%.*} + 1))" ]; then
|
||||||
|
echo "Can't start Nextcloud because upgrading from $installed_version to $image_version is not supported."
|
||||||
|
echo "It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Upgrading nextcloud from $installed_version ..."
|
||||||
|
run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
|
||||||
|
fi
|
||||||
|
if [ "$(id -u)" = 0 ]; then
|
||||||
|
rsync_options="-rlDog --chown $user:$group"
|
||||||
|
else
|
||||||
|
rsync_options="-rlD"
|
||||||
|
fi
|
||||||
|
|
||||||
|
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
|
||||||
|
for dir in config data custom_apps themes; do
|
||||||
|
if [ ! -d "/var/www/html/$dir" ] || directory_empty "/var/www/html/$dir"; then
|
||||||
|
rsync $rsync_options --include "/$dir/" --exclude '/*' /usr/src/nextcloud/ /var/www/html/
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
rsync $rsync_options --include '/version.php' --exclude '/*' /usr/src/nextcloud/ /var/www/html/
|
||||||
|
|
||||||
|
# Install
|
||||||
|
if [ "$installed_version" = "0.0.0.0" ]; then
|
||||||
|
echo "New nextcloud instance"
|
||||||
|
|
||||||
|
file_env NEXTCLOUD_ADMIN_PASSWORD
|
||||||
|
file_env NEXTCLOUD_ADMIN_USER
|
||||||
|
|
||||||
|
install=false
|
||||||
|
if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
|
||||||
|
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
|
||||||
|
fi
|
||||||
|
|
||||||
|
file_env MYSQL_DATABASE
|
||||||
|
file_env MYSQL_PASSWORD
|
||||||
|
file_env MYSQL_USER
|
||||||
|
file_env POSTGRES_DB
|
||||||
|
file_env POSTGRES_PASSWORD
|
||||||
|
file_env POSTGRES_USER
|
||||||
|
|
||||||
|
if [ -n "${SQLITE_DATABASE+x}" ]; then
|
||||||
|
echo "Installing with SQLite database"
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
install_options=$install_options' --database-name "$SQLITE_DATABASE"'
|
||||||
|
install=true
|
||||||
|
elif [ -n "${MYSQL_DATABASE+x}" ] && [ -n "${MYSQL_USER+x}" ] && [ -n "${MYSQL_PASSWORD+x}" ] && [ -n "${MYSQL_HOST+x}" ]; then
|
||||||
|
echo "Installing with MySQL database"
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
install_options=$install_options' --database mysql --database-name "$MYSQL_DATABASE" --database-user "$MYSQL_USER" --database-pass "$MYSQL_PASSWORD" --database-host "$MYSQL_HOST"'
|
||||||
|
install=true
|
||||||
|
elif [ -n "${POSTGRES_DB+x}" ] && [ -n "${POSTGRES_USER+x}" ] && [ -n "${POSTGRES_PASSWORD+x}" ] && [ -n "${POSTGRES_HOST+x}" ]; then
|
||||||
|
echo "Installing with PostgreSQL database"
|
||||||
|
# shellcheck disable=SC2016
|
||||||
|
install_options=$install_options' --database pgsql --database-name "$POSTGRES_DB" --database-user "$POSTGRES_USER" --database-pass "$POSTGRES_PASSWORD" --database-host "$POSTGRES_HOST"'
|
||||||
|
install=true
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$install" = true ]; then
|
||||||
|
run_path pre-installation
|
||||||
|
|
||||||
|
echo "Starting nextcloud installation"
|
||||||
|
max_retries=10
|
||||||
|
try=0
|
||||||
|
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
|
||||||
|
do
|
||||||
|
echo "Retrying install..."
|
||||||
|
try=$((try+1))
|
||||||
|
sleep 10s
|
||||||
|
done
|
||||||
|
if [ "$try" -gt "$max_retries" ]; then
|
||||||
|
echo "Installing of nextcloud failed!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
|
||||||
|
echo "Setting trusted domains…"
|
||||||
|
NC_TRUSTED_DOMAIN_IDX=1
|
||||||
|
for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
|
||||||
|
DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
|
||||||
|
run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
|
||||||
|
NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
run_path post-installation
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
# not enough specified to do a fully automated installation
|
||||||
|
if [ "$install" = false ]; then
|
||||||
|
echo "Next step: Access your instance to finish the web-based installation!"
|
||||||
|
echo "Hint: You can specify NEXTCLOUD_ADMIN_USER and NEXTCLOUD_ADMIN_PASSWORD and the database variables _prior to first launch_ to fully automate initial installation."
|
||||||
|
fi
|
||||||
|
# Upgrade
|
||||||
|
else
|
||||||
|
run_path pre-upgrade
|
||||||
|
|
||||||
|
run_as 'php /var/www/html/occ upgrade'
|
||||||
|
|
||||||
|
run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_after
|
||||||
|
echo "The following apps have been disabled:"
|
||||||
|
diff /tmp/list_before /tmp/list_after | grep '<' | cut -d- -f2 | cut -d: -f1
|
||||||
|
rm -f /tmp/list_before /tmp/list_after
|
||||||
|
|
||||||
|
run_path post-upgrade
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Initializing finished"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Update htaccess after init if requested
|
||||||
|
if [ -n "${NEXTCLOUD_INIT_HTACCESS+x}" ] && [ "$installed_version" != "0.0.0.0" ]; then
|
||||||
|
run_as 'php /var/www/html/occ maintenance:update:htaccess'
|
||||||
|
fi
|
||||||
|
) 9> /var/www/html/nextcloud-init-sync.lock
|
||||||
|
|
||||||
|
# warn if config files on persistent storage differ from the latest version of this image
|
||||||
|
for cfgPath in /usr/src/nextcloud/config/*.php; do
|
||||||
|
cfgFile=$(basename "$cfgPath")
|
||||||
|
|
||||||
|
if [ "$cfgFile" != "config.sample.php" ]; then
|
||||||
|
if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
|
||||||
|
echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
run_path before-starting
|
||||||
|
fi
|
||||||
|
|
||||||
|
exec "$@"
|
||||||
@ -1,5 +1,5 @@
|
|||||||
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
||||||
FROM php:8.3-fpm-trixie
|
FROM php:8.2-fpm-bookworm
|
||||||
|
|
||||||
# entrypoint.sh and cron.sh dependencies
|
# entrypoint.sh and cron.sh dependencies
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
@ -9,10 +9,10 @@ RUN set -ex; \
|
|||||||
busybox-static \
|
busybox-static \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
libldap-common \
|
libldap-common \
|
||||||
libmagickcore-7.q16-10-extra \
|
libmagickcore-6.q16-6-extra \
|
||||||
rsync \
|
rsync \
|
||||||
; \
|
; \
|
||||||
apt-get dist-clean; \
|
rm -rf /var/lib/apt/lists/*; \
|
||||||
\
|
\
|
||||||
mkdir -p /var/spool/cron/crontabs; \
|
mkdir -p /var/spool/cron/crontabs; \
|
||||||
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
echo '*/5 * * * * php -f /var/www/html/cron.php' > /var/spool/cron/crontabs/www-data
|
||||||
@ -21,7 +21,6 @@ RUN set -ex; \
|
|||||||
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
# see https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html
|
||||||
ENV PHP_MEMORY_LIMIT 512M
|
ENV PHP_MEMORY_LIMIT 512M
|
||||||
ENV PHP_UPLOAD_LIMIT 512M
|
ENV PHP_UPLOAD_LIMIT 512M
|
||||||
ENV PHP_OPCACHE_MEMORY_CONSUMPTION 128
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
\
|
\
|
||||||
savedAptMark="$(apt-mark showmanual)"; \
|
savedAptMark="$(apt-mark showmanual)"; \
|
||||||
@ -35,8 +34,8 @@ RUN set -ex; \
|
|||||||
libicu-dev \
|
libicu-dev \
|
||||||
libjpeg-dev \
|
libjpeg-dev \
|
||||||
libldap2-dev \
|
libldap2-dev \
|
||||||
liblz4-dev \
|
|
||||||
libmagickwand-dev \
|
libmagickwand-dev \
|
||||||
|
libmcrypt-dev \
|
||||||
libmemcached-dev \
|
libmemcached-dev \
|
||||||
libpng-dev \
|
libpng-dev \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
@ -57,6 +56,7 @@ RUN set -ex; \
|
|||||||
gmp \
|
gmp \
|
||||||
intl \
|
intl \
|
||||||
ldap \
|
ldap \
|
||||||
|
opcache \
|
||||||
pcntl \
|
pcntl \
|
||||||
pdo_mysql \
|
pdo_mysql \
|
||||||
pdo_pgsql \
|
pdo_pgsql \
|
||||||
@ -65,17 +65,13 @@ RUN set -ex; \
|
|||||||
; \
|
; \
|
||||||
\
|
\
|
||||||
# pecl will claim success even if one install fails, so we need to perform each install separately
|
# pecl will claim success even if one install fails, so we need to perform each install separately
|
||||||
pecl install APCu-5.1.28; \
|
pecl install APCu-5.1.23; \
|
||||||
pecl install igbinary-3.2.16; \
|
pecl install imagick-3.7.0; \
|
||||||
pecl install imagick-3.8.1; \
|
pecl install memcached-3.2.0; \
|
||||||
pecl install --configureoptions 'enable-memcached-igbinary="yes"' \
|
pecl install redis-6.0.2; \
|
||||||
memcached-3.4.0; \
|
|
||||||
pecl install --configureoptions 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' \
|
|
||||||
redis-6.3.0; \
|
|
||||||
\
|
\
|
||||||
docker-php-ext-enable \
|
docker-php-ext-enable \
|
||||||
apcu \
|
apcu \
|
||||||
igbinary \
|
|
||||||
imagick \
|
imagick \
|
||||||
memcached \
|
memcached \
|
||||||
redis \
|
redis \
|
||||||
@ -88,14 +84,13 @@ RUN set -ex; \
|
|||||||
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
|
||||||
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
|
| awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt dpkg-query --search \
|
| xargs -r dpkg-query --search \
|
||||||
# https://manpages.debian.org/trixie/dpkg/dpkg-query.1.en.html#S (we ignore diversions and it'll be really unusual for more than one package to provide any given .so file)
|
| cut -d: -f1 \
|
||||||
| awk 'sub(":$", "", $1) { print $1 }' \
|
|
||||||
| sort -u \
|
| sort -u \
|
||||||
| xargs -rt apt-mark manual; \
|
| xargs -rt apt-mark manual; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||||
apt-get dist-clean
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# set recommended PHP.ini settings
|
# set recommended PHP.ini settings
|
||||||
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
# see https://docs.nextcloud.com/server/latest/admin_manual/installation/server_tuning.html#enable-php-opcache
|
||||||
@ -103,20 +98,15 @@ RUN { \
|
|||||||
echo 'opcache.enable=1'; \
|
echo 'opcache.enable=1'; \
|
||||||
echo 'opcache.interned_strings_buffer=32'; \
|
echo 'opcache.interned_strings_buffer=32'; \
|
||||||
echo 'opcache.max_accelerated_files=10000'; \
|
echo 'opcache.max_accelerated_files=10000'; \
|
||||||
echo 'opcache.memory_consumption=${PHP_OPCACHE_MEMORY_CONSUMPTION}'; \
|
echo 'opcache.memory_consumption=128'; \
|
||||||
echo 'opcache.save_comments=1'; \
|
echo 'opcache.save_comments=1'; \
|
||||||
echo 'opcache.revalidate_freq=60'; \
|
echo 'opcache.revalidate_freq=60'; \
|
||||||
echo 'opcache.jit=1255'; \
|
echo 'opcache.jit=1255'; \
|
||||||
echo 'opcache.jit_buffer_size=8M'; \
|
echo 'opcache.jit_buffer_size=128M'; \
|
||||||
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
} > "${PHP_INI_DIR}/conf.d/opcache-recommended.ini"; \
|
||||||
\
|
\
|
||||||
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
echo 'apc.enable_cli=1' >> "${PHP_INI_DIR}/conf.d/docker-php-ext-apcu.ini"; \
|
||||||
\
|
\
|
||||||
{ \
|
|
||||||
echo 'apc.serializer=igbinary'; \
|
|
||||||
echo 'session.serialize_handler=igbinary'; \
|
|
||||||
} >> "${PHP_INI_DIR}/conf.d/docker-php-ext-igbinary.ini"; \
|
|
||||||
\
|
|
||||||
{ \
|
{ \
|
||||||
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \
|
||||||
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \
|
||||||
@ -135,7 +125,7 @@ RUN { \
|
|||||||
VOLUME /var/www/html
|
VOLUME /var/www/html
|
||||||
|
|
||||||
|
|
||||||
ENV NEXTCLOUD_VERSION 31.0.12
|
ENV NEXTCLOUD_VERSION 28.0.8
|
||||||
|
|
||||||
RUN set -ex; \
|
RUN set -ex; \
|
||||||
fetchDeps=" \
|
fetchDeps=" \
|
||||||
@ -145,8 +135,8 @@ RUN set -ex; \
|
|||||||
apt-get update; \
|
apt-get update; \
|
||||||
apt-get install -y --no-install-recommends $fetchDeps; \
|
apt-get install -y --no-install-recommends $fetchDeps; \
|
||||||
\
|
\
|
||||||
curl -fsSL -o nextcloud.tar.bz2 "https://github.com/nextcloud-releases/server/releases/download/v31.0.12/nextcloud-31.0.12.tar.bz2"; \
|
curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2"; \
|
||||||
curl -fsSL -o nextcloud.tar.bz2.asc "https://github.com/nextcloud-releases/server/releases/download/v31.0.12/nextcloud-31.0.12.tar.bz2.asc"; \
|
curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.8.tar.bz2.asc"; \
|
||||||
export GNUPGHOME="$(mktemp -d)"; \
|
export GNUPGHOME="$(mktemp -d)"; \
|
||||||
# gpg key from https://nextcloud.com/nextcloud.asc
|
# gpg key from https://nextcloud.com/nextcloud.asc
|
||||||
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
|
||||||
@ -160,7 +150,7 @@ RUN set -ex; \
|
|||||||
chmod +x /usr/src/nextcloud/occ; \
|
chmod +x /usr/src/nextcloud/occ; \
|
||||||
\
|
\
|
||||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
|
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false $fetchDeps; \
|
||||||
apt-get dist-clean
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY *.sh upgrade.exclude /
|
COPY *.sh upgrade.exclude /
|
||||||
COPY config/* /usr/src/nextcloud/config/
|
COPY config/* /usr/src/nextcloud/config/
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user