aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-25 04:40:55 +02:00
Code Activity

Documentation and examples update for use with docker compose v2 (#2201)

Browse source 
* Update examples section according to the latest docker compose requirements.

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Minor readme updates to match the changes for the compose v2 syntax.

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Fix wrong environment variable

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Add missing headers to fpm config

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Fix  cache control

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Add mjs file extension in a proper way.

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Typos fixed, minor clarification changes

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Removed logging from compose files.

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Restored MariaDB to 10.6 as per docs suggestions

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Remove extra nginx volume

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Removed GH specific markdown from Readme, change mariadb to recommended version

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* typo

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Update .examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml

Signed-off-by: J0WI <J0WI@users.noreply.github.com>

* Update to correct MariaDB command

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Updated compose files for mariadb to match current docs

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Update outdated docker-compose command in Readme

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Added back --log-bin to MariaDB command. See PR 1881

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Remove wrongly added logging to Readme.MD

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Use proper name for --log-bin param

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

---------

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
This commit is contained in:
Kaloyan Nikolov 2024-10-07 20:27:05 +03:00 • committed by GitHub
parent 9ff7b6a529
commit 38994cbb87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 144 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml → .examples/docker-compose/insecure/mariadb/apache/compose.yaml
View file

@ -1,5 +1,3 @@
version: '3'
services:
db:
image: mariadb:10.6

2
.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml → .examples/docker-compose/insecure/mariadb/fpm/compose.yaml
View file

@ -1,5 +1,3 @@
version: '3'
services:
db:
image: mariadb:10.6

29
.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
View file

@ -12,6 +12,9 @@ events {
http {
include mime.types;
default_type application/octet-stream;
types {
text/javascript mjs;
}
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
@ -30,7 +33,7 @@ http {
# Set the `immutable` cache control options only for assets with a cache busting `v` argument
map $arg_v $asset_immutable {
"" "";
default "immutable";
default ", immutable";
}
#gzip on;
@ -162,24 +165,16 @@ http {
fastcgi_max_temp_file_size 0;
}
# Javascript mimetype fixes for nginx
# 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;
add_header Cache-Control "public, max-age=15778463, $asset_immutable";
access_log off;
}
# Serve static files
location ~ \.(?:css|svg|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
location ~ \.(?:css|svg|js|mjs|gif|png|jpg|ico|wasm|tflite|map|ogg|flac)$ {
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;
add_header X-Content-Type-Options "nosniff" always;
add_header X-Frame-Options "SAMEORIGIN" always;
add_header X-Permitted-Cross-Domain-Policies "none" always;
add_header X-Robots-Tag "noindex, nofollow" always;
add_header X-XSS-Protection "1; mode=block" always;
access_log off; # Optional: Don't log access to assets
location ~ \.wasm$ {