Added alot of updates
This commit is contained in:
@@ -1,23 +1,22 @@
|
||||
version: "3"
|
||||
|
||||
|
||||
volumes:
|
||||
gitea_data:
|
||||
driver_opts:
|
||||
type: nfs
|
||||
o: addr=dockerstorage,nfsvers=4
|
||||
device: :/dockerstorage/gitea
|
||||
device: :/docker_config/gitea
|
||||
|
||||
gitea_repository:
|
||||
driver_opts:
|
||||
type: nfs
|
||||
o: addr=maurice,nfsvers=4
|
||||
o: addr=dockerstorage,nfsvers=4
|
||||
device: :/repositories/git
|
||||
|
||||
services:
|
||||
server:
|
||||
image: gitea/gitea:1.18.1
|
||||
|
||||
image: gitea/gitea
|
||||
container_name: gitea
|
||||
volumes:
|
||||
- gitea_data:/data
|
||||
- gitea_repository:/data/git/repo
|
||||
|
||||
@@ -6,22 +6,19 @@ volumes:
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
# device: /nctest/home
|
||||
device: /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/nextcloud/home
|
||||
device: /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/home
|
||||
ncdb:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
# device: /nctest/db
|
||||
device: /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/nextcloud/database
|
||||
device: /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database
|
||||
ncdata:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
# device: /nctest/storage
|
||||
device: /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/nextcloud/storage
|
||||
device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/nextcloud/storage
|
||||
|
||||
|
||||
services:
|
||||
@@ -37,6 +34,15 @@ services:
|
||||
- MYSQL_DATABASE=nextcloud
|
||||
- MYSQL_USER=nextcloud
|
||||
|
||||
aio-imaginary:
|
||||
image: nextcloud/aio-imaginary:latest
|
||||
restart: always
|
||||
environment:
|
||||
- PORT=9000
|
||||
ports:
|
||||
- 9999:9000
|
||||
command: -concurrency 50 -enable-url-source
|
||||
|
||||
nextcloud:
|
||||
build:
|
||||
context: ./nc-fpm
|
||||
@@ -49,12 +55,13 @@ services:
|
||||
volumes:
|
||||
- nchome:/var/www/html:z
|
||||
- ncdata:/var/www/html/data
|
||||
- /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/bands/Fearium:/ex_storage/bands/fearium
|
||||
- /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/bands/Breakpoint9:/ex_storage/bands/breakpointnine
|
||||
- /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/music:/ex_storage/music
|
||||
- /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/video:/ex_storage/video
|
||||
- /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/repositories:/ex_storage/repositories
|
||||
- /srv/dev-disk-by-uuid-8ad400b8-bff1-4ae4-971c-9002f823ba0c/hwsw:/ex_storage/hwsw
|
||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/:/ex_storage/
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/bands/Fearium:/ex_storage/bands/fearium
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/bands/Breakpoint9:/ex_storage/bands/breakpointnine
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/music:/ex_storage/music
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/video:/ex_storage/video
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/repositories:/ex_storage/repositories
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/hwsw:/ex_storage/hwsw
|
||||
|
||||
|
||||
environment:
|
||||
|
||||
@@ -5,7 +5,7 @@ volumes:
|
||||
driver_opts:
|
||||
type: nfs
|
||||
o: addr=dockerstorage,nfsvers=4
|
||||
device: :/dockerstorage/swag
|
||||
device: :/docker_config/swag
|
||||
|
||||
services:
|
||||
swag:
|
||||
@@ -31,5 +31,5 @@ services:
|
||||
- swag_data:/config
|
||||
ports:
|
||||
- 443:443
|
||||
- 80:80 #optional
|
||||
- 81:80 #optional
|
||||
restart: unless-stopped
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
#FROM alpine
|
||||
FROM ubuntu:latest as build
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
# install rclone
|
||||
#RUN apk -U add ca-certificates fuse rclone dcron tzdata \
|
||||
# && rm -rf /var/cache/apk/*
|
||||
RUN apt update
|
||||
RUN apt install -y ca-certificates fuse cron tzdata rclone \
|
||||
&& apt autoremove -y \
|
||||
&& rm -rf /var/lib/apt/lists/* \
|
||||
&& apt clean
|
||||
|
||||
|
||||
# install entrypoint
|
||||
ADD docker-entrypoint.sh /docker-entrypoint.sh
|
||||
RUN chmod +x /docker-entrypoint.sh
|
||||
|
||||
#ADD config/rclone.conf /root/.config/rclone/rclone.conf
|
||||
|
||||
#VOLUME ["/config"]
|
||||
|
||||
# defaults env vars
|
||||
ENV CRON_SCHEDULE="0 0 * * *"
|
||||
ENV COMMAND="rclone version"
|
||||
|
||||
ENTRYPOINT ["/docker-entrypoint.sh"]
|
||||
|
||||
RUN touch /var/log/cron.log
|
||||
|
||||
CMD ["cron", "-f"]
|
||||
#CMD cron -f -l 2
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
set -e
|
||||
|
||||
CRONJOB="$CRON_SCHEDULE $COMMAND $RCLONE_OPTS"
|
||||
CRONJOB="$CRON_SCHEDULE flock -n /root/rclone.lock $COMMAND $RCLONE_OPTS"
|
||||
|
||||
echo "Configuring..."
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
version: "2.1"
|
||||
services:
|
||||
netbootxyz:
|
||||
image: lscr.io/linuxserver/netbootxyz:latest
|
||||
container_name: netbootxyz
|
||||
environment:
|
||||
- TZ=Etc/UTC
|
||||
- PORT_RANGE=30000:30010
|
||||
- SUBFOLDER=/
|
||||
volumes:
|
||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/netboot_xyz/assets:/assets
|
||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/docker_config/netboot_xyz/config:/config
|
||||
ports:
|
||||
- 2000:3000
|
||||
- 69:69/udp
|
||||
- 2080:80
|
||||
restart: unless-stopped
|
||||
@@ -0,0 +1,115 @@
|
||||
version: "3"
|
||||
|
||||
volumes:
|
||||
nchome:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/home
|
||||
ncdb:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/nextcloud/database
|
||||
ncdata:
|
||||
driver: local
|
||||
driver_opts:
|
||||
type: none
|
||||
o: bind
|
||||
device: /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/nextcloud/storage
|
||||
|
||||
|
||||
services:
|
||||
db:
|
||||
image: mariadb:10.6
|
||||
restart: always
|
||||
command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
|
||||
volumes:
|
||||
- ncdb:/var/lib/mysql:Z
|
||||
environment:
|
||||
- MYSQL_ROOT_PASSWORD=rootpw
|
||||
- MYSQL_PASSWORD=password
|
||||
- MYSQL_DATABASE=nextcloud
|
||||
- MYSQL_USER=nextcloud
|
||||
|
||||
aio-imaginary:
|
||||
image: nextcloud/aio-imaginary:latest
|
||||
restart: always
|
||||
environment:
|
||||
- PORT=9000
|
||||
ports:
|
||||
- 9999:9000
|
||||
command: -concurrency 50 -enable-url-source
|
||||
|
||||
nextcloud:
|
||||
build:
|
||||
context: ./nc-fpm
|
||||
args:
|
||||
UID: ${MUID}
|
||||
GID: ${MGID}
|
||||
restart: always
|
||||
links:
|
||||
- db
|
||||
volumes:
|
||||
- nchome:/var/www/html:z
|
||||
- ncdata:/var/www/html/data
|
||||
- /srv/dev-disk-by-uuid-17e88007-4d0c-45e0-8757-cacfcc458630/:/ex_storage/
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/bands/Fearium:/ex_storage/bands/fearium
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/bands/Breakpoint9:/ex_storage/bands/breakpointnine
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/music:/ex_storage/music
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/video:/ex_storage/video
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/repositories:/ex_storage/repositories
|
||||
# - /srv/dev-disk-by-uuid-9033ccb2-df6d-46a3-9996-99a0d4d34688/hwsw:/ex_storage/hwsw
|
||||
|
||||
|
||||
environment:
|
||||
- MYSQL_PASSWORD=password
|
||||
- MYSQL_DATABASE=nextcloud
|
||||
- MYSQL_USER=nextcloud
|
||||
- MYSQL_HOST=db
|
||||
- REDIS_HOST=redis
|
||||
|
||||
nginx:
|
||||
build:
|
||||
context: ./nginx
|
||||
args:
|
||||
UID: ${MUID}
|
||||
GID: ${MGID}
|
||||
restart: always
|
||||
ports:
|
||||
- 8888:80
|
||||
links:
|
||||
- nextcloud
|
||||
volumes:
|
||||
- nchome:/var/www/html:z,ro
|
||||
|
||||
redis:
|
||||
build:
|
||||
context: ./redis
|
||||
args:
|
||||
UID: ${MUID}
|
||||
GID: ${MGID}
|
||||
restart: always
|
||||
|
||||
cron:
|
||||
build:
|
||||
context: ./nc-fpm
|
||||
args:
|
||||
UID: ${MUID}
|
||||
GID: ${MGID}
|
||||
restart: always
|
||||
volumes:
|
||||
- nchome:/var/www/html:z
|
||||
- ncdata:/var/www/html/data
|
||||
environment:
|
||||
- MYSQL_PASSWORD=password
|
||||
- MYSQL_DATABASE=nextcloud
|
||||
- MYSQL_USER=nextcloud
|
||||
- MYSQL_HOST=db
|
||||
- REDIS_HOST=redis
|
||||
entrypoint: /cron.sh
|
||||
depends_on:
|
||||
- nextcloud
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
FROM nextcloud:fpm
|
||||
|
||||
ARG UID=1000
|
||||
ARG GID=1000
|
||||
|
||||
#RUN adduser --system --no-create-home --home /nonexistent --gecos 'www-data user' --shell /bin/false --uid 82 www-data
|
||||
RUN usermod -u $UID -o www-data
|
||||
RUN apt update \
|
||||
&& apt -y install libmagickcore-6.q16-6-extra ffmpeg imagemagick ghostscript \
|
||||
&& apt clean
|
||||
|
||||
# Add custom cron job for previews
|
||||
RUN echo '*/15 * * * * php /var/www/html/occ preview:pre-generate' >> /var/spool/cron/crontabs/www-data
|
||||
@@ -0,0 +1,11 @@
|
||||
#FROM nginx:alpine
|
||||
FROM nginx:bullseye
|
||||
|
||||
ARG UID=1000
|
||||
ARG GID=1000
|
||||
|
||||
RUN usermod -u $UID -o www-data
|
||||
|
||||
#RUN adduser --system --no-create-home --home /nonexistent --gecos 'www-data user' --shell /bin/false --uid $UID www-data
|
||||
|
||||
COPY nginx.conf /etc/nginx/nginx.conf
|
||||
@@ -0,0 +1,175 @@
|
||||
user www-data;
|
||||
worker_processes auto;
|
||||
|
||||
error_log /var/log/nginx/error.log warn;
|
||||
pid /var/run/nginx.pid;
|
||||
|
||||
|
||||
events {
|
||||
worker_connections 1024;
|
||||
}
|
||||
|
||||
|
||||
http {
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
|
||||
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||
'$status $body_bytes_sent "$http_referer" '
|
||||
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||
|
||||
access_log /var/log/nginx/access.log main;
|
||||
|
||||
sendfile on;
|
||||
#tcp_nopush on;
|
||||
|
||||
# Prevent nginx HTTP Server Detection
|
||||
server_tokens off;
|
||||
|
||||
keepalive_timeout 65;
|
||||
|
||||
#gzip on;
|
||||
|
||||
upstream php-handler {
|
||||
server nextcloud:9000;
|
||||
}
|
||||
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
|
||||
# HSTS settings
|
||||
# WARNING: Only add the preload option once you read about
|
||||
# the consequences in https://hstspreload.org/. This option
|
||||
# will add the domain to a hardcoded list that is shipped
|
||||
# in all major browsers and getting removed from this list
|
||||
# could take several months.
|
||||
#add_header Strict-Transport-Security "max-age=15768000; includeSubDomains; preload;" always;
|
||||
|
||||
# set max upload size
|
||||
client_max_body_size 512M;
|
||||
fastcgi_buffers 64 4K;
|
||||
|
||||
# Enable gzip but do not remove ETag headers
|
||||
gzip on;
|
||||
gzip_vary on;
|
||||
gzip_comp_level 4;
|
||||
gzip_min_length 256;
|
||||
gzip_proxied expired no-cache no-store private no_last_modified no_etag auth;
|
||||
gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy;
|
||||
|
||||
# Pagespeed is not supported by Nextcloud, so if your server is built
|
||||
# with the `ngx_pagespeed` module, uncomment this line to disable it.
|
||||
#pagespeed off;
|
||||
|
||||
# HTTP response headers borrowed from Nextcloud `.htaccess`
|
||||
add_header Referrer-Policy "no-referrer" always;
|
||||
add_header X-Content-Type-Options "nosniff" always;
|
||||
add_header X-Download-Options "noopen" always;
|
||||
add_header X-Frame-Options "SAMEORIGIN" always;
|
||||
add_header X-Permitted-Cross-Domain-Policies "none" always;
|
||||
add_header X-Robots-Tag "noindex, nofollow" always;
|
||||
add_header X-XSS-Protection "1; mode=block" always;
|
||||
|
||||
# Remove X-Powered-By, which is an information leak
|
||||
fastcgi_hide_header X-Powered-By;
|
||||
|
||||
# Path to the root of your installation
|
||||
root /var/www/html;
|
||||
|
||||
# Specify how to handle directories -- specifying `/index.php$request_uri`
|
||||
# here as the fallback means that Nginx always exhibits the desired behaviour
|
||||
# when a client requests a path that corresponds to a directory that exists
|
||||
# on the server. In particular, if that directory contains an index.php file,
|
||||
# that file is correctly served; if it doesn't, then the request is passed to
|
||||
# the front-end controller. This consistent behaviour means that we don't need
|
||||
# to specify custom rules for certain paths (e.g. images and other assets,
|
||||
# `/updater`, `/ocm-provider`, `/ocs-provider`), and thus
|
||||
# `try_files $uri $uri/ /index.php$request_uri`
|
||||
# always provides the desired behaviour.
|
||||
index index.php index.html /index.php$request_uri;
|
||||
|
||||
# Rule borrowed from `.htaccess` to handle Microsoft DAV clients
|
||||
location = / {
|
||||
if ( $http_user_agent ~ ^DavClnt ) {
|
||||
return 302 /remote.php/webdav/$is_args$args;
|
||||
}
|
||||
}
|
||||
|
||||
location = /robots.txt {
|
||||
allow all;
|
||||
log_not_found off;
|
||||
access_log off;
|
||||
}
|
||||
|
||||
# Make a regex exception for `/.well-known` so that clients can still
|
||||
# access it despite the existence of the regex rule
|
||||
# `location ~ /(\.|autotest|...)` which would otherwise handle requests
|
||||
# for `/.well-known`.
|
||||
location ^~ /.well-known {
|
||||
# The rules in this block are an adaptation of the rules
|
||||
# in `.htaccess` that concern `/.well-known`.
|
||||
|
||||
location = /.well-known/carddav { return 301 /remote.php/dav/; }
|
||||
location = /.well-known/caldav { return 301 /remote.php/dav/; }
|
||||
|
||||
location /.well-known/acme-challenge { try_files $uri $uri/ =404; }
|
||||
location /.well-known/pki-validation { try_files $uri $uri/ =404; }
|
||||
|
||||
# Let Nextcloud's API for `/.well-known` URIs handle all other
|
||||
# requests by passing them to the front-end controller.
|
||||
return 301 /index.php$request_uri;
|
||||
}
|
||||
|
||||
# Rules borrowed from `.htaccess` to hide certain paths from clients
|
||||
location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)(?:$|/) { return 404; }
|
||||
location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { return 404; }
|
||||
|
||||
# Ensure this block, which passes PHP files to the PHP process, is above the blocks
|
||||
# which handle static assets (as seen below). If this block is not declared first,
|
||||
# then Nginx will encounter an infinite rewriting loop when it prepends `/index.php`
|
||||
# to the URI, resulting in a HTTP 500 error response.
|
||||
location ~ \.php(?:$|/) {
|
||||
# Required for legacy support
|
||||
rewrite ^/(?!index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+|.+\/richdocumentscode\/proxy) /index.php$request_uri;
|
||||
|
||||
fastcgi_split_path_info ^(.+?\.php)(/.*)$;
|
||||
set $path_info $fastcgi_path_info;
|
||||
|
||||
try_files $fastcgi_script_name =404;
|
||||
|
||||
include fastcgi_params;
|
||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||
fastcgi_param PATH_INFO $path_info;
|
||||
#fastcgi_param HTTPS on;
|
||||
|
||||
fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice
|
||||
fastcgi_param front_controller_active true; # Enable pretty urls
|
||||
fastcgi_pass php-handler;
|
||||
|
||||
fastcgi_intercept_errors on;
|
||||
fastcgi_request_buffering off;
|
||||
}
|
||||
|
||||
location ~ \.(?:css|js|svg|gif)$ {
|
||||
try_files $uri /index.php$request_uri;
|
||||
expires 6M; # Cache-Control policy borrowed from `.htaccess`
|
||||
access_log off; # Optional: Don't log access to assets
|
||||
}
|
||||
|
||||
location ~ \.woff2?$ {
|
||||
try_files $uri /index.php$request_uri;
|
||||
expires 7d; # Cache-Control policy borrowed from `.htaccess`
|
||||
access_log off; # Optional: Don't log access to assets
|
||||
}
|
||||
|
||||
# Rule borrowed from `.htaccess`
|
||||
location /remote {
|
||||
return 301 /remote.php$request_uri;
|
||||
}
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.php$request_uri;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
FROM redis:latest
|
||||
|
||||
ARG UID=1000
|
||||
ARG GID=1000
|
||||
|
||||
RUN usermod -u $UID -o www-data
|
||||
Executable
+3
@@ -0,0 +1,3 @@
|
||||
MUID="$(id -u www-data)" MGID="$(id -g www-data)" docker-compose build --no-cache
|
||||
MUID="$(id -u www-data)" MGID="$(id -g www-data)" docker-compose up -d --force-recreate
|
||||
|
||||
Reference in New Issue
Block a user