Compare commits
13
Commits
a43ed29165
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c2b6f09da9 | ||
|
|
0ef4c4bb20 | ||
|
|
52064864f5 | ||
|
|
1da5a28e23 | ||
|
|
45ce3b3b6a | ||
|
|
b9453edde9 | ||
|
|
1c12f71a87 | ||
|
|
abf61c979f | ||
|
|
dc64f06273 | ||
|
|
20864fd260 | ||
|
|
f2beb701e6 | ||
|
|
6e02bd39ae | ||
|
|
abbcdb1a02 |
No files matched your search
@@ -0,0 +1,4 @@
|
|||||||
|
[submodule "miyouqian/upstream"]
|
||||||
|
path = miyouqian/upstream
|
||||||
|
url = https://github.com/Marchen-orz/MiyoQian.git
|
||||||
|
branch = master
|
||||||
@@ -21,6 +21,8 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.2"
|
cpus: "0.2"
|
||||||
memory: 128M
|
memory: 128M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
@@ -20,6 +20,16 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
cap_add:
|
||||||
|
- CHOWN
|
||||||
|
- DAC_OVERRIDE
|
||||||
|
- DAC_READ_SEARCH
|
||||||
|
- FOWNER
|
||||||
|
- FSETID
|
||||||
|
# Root keeps only the capabilities restic needs to read and restore
|
||||||
|
# files owned by other users.
|
||||||
|
cap_drop:
|
||||||
|
- ALL
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
@@ -28,6 +38,8 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "1.0"
|
cpus: "1.0"
|
||||||
memory: 512M
|
memory: 512M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
@@ -68,6 +68,8 @@ docker_args=(
|
|||||||
run
|
run
|
||||||
--rm
|
--rm
|
||||||
--network "container:$CONTAINER"
|
--network "container:$CONTAINER"
|
||||||
|
--cap-drop ALL
|
||||||
|
--security-opt no-new-privileges:true
|
||||||
--cap-add NET_RAW
|
--cap-add NET_RAW
|
||||||
--cap-add NET_ADMIN
|
--cap-add NET_ADMIN
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -4,12 +4,24 @@ set -euo pipefail
|
|||||||
SCRIPT_DIR="$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"
|
SCRIPT_DIR="$(dirname -- "$(readlink -f -- "${BASH_SOURCE[0]}")")"
|
||||||
STACKS_DIR="${STACKS_DIR:-$SCRIPT_DIR}"
|
STACKS_DIR="${STACKS_DIR:-$SCRIPT_DIR}"
|
||||||
docker_args=(--rm -v "$STACKS_DIR:/app")
|
docker_args=(--rm -v "$STACKS_DIR:/app")
|
||||||
dclint_args=(. -r)
|
dclint_args=()
|
||||||
|
|
||||||
if [[ -t 1 ]]; then
|
if [[ -t 1 ]]; then
|
||||||
docker_args+=(-t)
|
docker_args+=(-t)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Scan immediate stack directories without recursing into their subdirectories.
|
||||||
|
shopt -s nullglob
|
||||||
|
for stack_dir in "$STACKS_DIR"/*/; do
|
||||||
|
stack_dir="${stack_dir%/}"
|
||||||
|
dclint_args+=("/app/${stack_dir##*/}")
|
||||||
|
done
|
||||||
|
|
||||||
|
if ((${#dclint_args[@]} == 0)); then
|
||||||
|
printf 'No stack directories found in %s\n' "$STACKS_DIR" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
case "${1:-}" in
|
case "${1:-}" in
|
||||||
"")
|
"")
|
||||||
;;
|
;;
|
||||||
|
|||||||
@@ -15,3 +15,5 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.1"
|
cpus: "0.1"
|
||||||
memory: 16M
|
memory: 16M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
@@ -18,6 +18,8 @@ services:
|
|||||||
limits:
|
limits:
|
||||||
cpus: "1.0"
|
cpus: "1.0"
|
||||||
memory: 512M
|
memory: 512M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
@@ -8,7 +8,7 @@ services:
|
|||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- /run/dbus:/run/dbus:ro
|
- /run/dbus:/run/dbus:ro
|
||||||
environment:
|
environment:
|
||||||
- TZ=Asia/Shanghai
|
TZ: Asia/Shanghai
|
||||||
network_mode: host
|
network_mode: host
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
deploy:
|
deploy:
|
||||||
@@ -19,4 +19,6 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.2"
|
cpus: "0.2"
|
||||||
memory: 512M
|
memory: 512M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
stop_grace_period: 60s
|
stop_grace_period: 60s
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
name: homepage
|
||||||
|
services:
|
||||||
|
homepage:
|
||||||
|
image: ghcr.io/gethomepage/homepage:v2.7.0
|
||||||
|
container_name: homepage
|
||||||
|
volumes:
|
||||||
|
- /srv/data/homepage:/app/config
|
||||||
|
# - /var/run/docker.sock:/var/run/docker.sock:ro
|
||||||
|
environment:
|
||||||
|
HOMEPAGE_ALLOWED_HOSTS: home.linkwu.de
|
||||||
|
PUID: "1000"
|
||||||
|
PGID: "1000"
|
||||||
|
networks:
|
||||||
|
- proxy
|
||||||
|
restart: unless-stopped
|
||||||
|
cap_add:
|
||||||
|
- CHOWN
|
||||||
|
- SETGID
|
||||||
|
- SETUID
|
||||||
|
cap_drop:
|
||||||
|
- ALL
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: "0.5"
|
||||||
|
memory: 1G
|
||||||
|
reservations:
|
||||||
|
cpus: "0.1"
|
||||||
|
memory: 64M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
|
networks:
|
||||||
|
proxy:
|
||||||
|
external: true
|
||||||
@@ -33,6 +33,8 @@ services:
|
|||||||
memory: 512M
|
memory: 512M
|
||||||
devices:
|
devices:
|
||||||
- /dev/dri:/dev/dri
|
- /dev/dri:/dev/dri
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
immich-machine-learning:
|
immich-machine-learning:
|
||||||
image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
|
image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
|
||||||
container_name: immich-machine-learning
|
container_name: immich-machine-learning
|
||||||
@@ -43,11 +45,15 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
disable: false
|
disable: false
|
||||||
|
cap_drop:
|
||||||
|
- ALL
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
cpus: "2.0"
|
cpus: "2.0"
|
||||||
memory: 4G
|
memory: 4G
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
database:
|
database:
|
||||||
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23
|
image: ghcr.io/immich-app/postgres:14-vectorchord0.4.3-pgvectors0.2.0@sha256:bcf63357191b76a916ae5eb93464d65c07511da41e3bf7a8416db519b40b1c23
|
||||||
container_name: immich-postgres
|
container_name: immich-postgres
|
||||||
@@ -71,6 +77,8 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.2"
|
cpus: "0.2"
|
||||||
memory: 128M
|
memory: 128M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
shm_size: 128mb
|
shm_size: 128mb
|
||||||
redis:
|
redis:
|
||||||
image: docker.io/valkey/valkey:9@sha256:c123e3715db63d06d4ad6964884037aa0d5d4d703939b9929954112889708e1d
|
image: docker.io/valkey/valkey:9@sha256:c123e3715db63d06d4ad6964884037aa0d5d4d703939b9929954112889708e1d
|
||||||
@@ -78,6 +86,13 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: redis-cli ping || exit 1
|
test: redis-cli ping || exit 1
|
||||||
|
cap_add:
|
||||||
|
- CHOWN
|
||||||
|
- SETGID
|
||||||
|
- SETUID
|
||||||
|
# The official image starts as root and drops to the valkey user.
|
||||||
|
cap_drop:
|
||||||
|
- ALL
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
@@ -86,6 +101,8 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.1"
|
cpus: "0.1"
|
||||||
memory: 64M
|
memory: 64M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
+1
-1
@@ -10,7 +10,7 @@ DB_DATA_LOCATION=/srv/fast/immich/postgres
|
|||||||
TZ=Asia/Shanghai
|
TZ=Asia/Shanghai
|
||||||
|
|
||||||
# The Immich version to use. You can pin this to a specific version like "v2.1.0"
|
# The Immich version to use. You can pin this to a specific version like "v2.1.0"
|
||||||
IMMICH_VERSION=v3.3.3
|
IMMICH_VERSION=v3.3.5
|
||||||
|
|
||||||
# Connection secret for postgres. You should change it to a random password
|
# Connection secret for postgres. You should change it to a random password
|
||||||
# Please use only the characters `A-Za-z0-9`, without special characters or spaces
|
# Please use only the characters `A-Za-z0-9`, without special characters or spaces
|
||||||
|
|||||||
@@ -0,0 +1,34 @@
|
|||||||
|
name: miyouqian
|
||||||
|
services:
|
||||||
|
miyouqian:
|
||||||
|
build:
|
||||||
|
context: ./upstream
|
||||||
|
dockerfile: docker/Dockerfile
|
||||||
|
container_name: miyouqian
|
||||||
|
volumes:
|
||||||
|
- /srv/data/miyouqian:/app/state
|
||||||
|
environment:
|
||||||
|
TZ: Asia/Shanghai
|
||||||
|
networks:
|
||||||
|
- proxy
|
||||||
|
restart: unless-stopped
|
||||||
|
cap_drop:
|
||||||
|
- ALL
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
cpus: "0.5"
|
||||||
|
memory: 256M
|
||||||
|
reservations:
|
||||||
|
cpus: "0.1"
|
||||||
|
memory: 64M
|
||||||
|
init: true
|
||||||
|
read_only: true
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
|
tmpfs:
|
||||||
|
- /tmp
|
||||||
|
|
||||||
|
networks:
|
||||||
|
proxy:
|
||||||
|
external: true
|
||||||
Submodule
+1
Submodule miyouqian/upstream added at e06cf1017a.
+6
-2
@@ -1,7 +1,7 @@
|
|||||||
name: nginx
|
name: nginx
|
||||||
services:
|
services:
|
||||||
nginx:
|
nginx:
|
||||||
image: nginx:1-alpine
|
image: nginx:1.31.7-alpine
|
||||||
container_name: nginx
|
container_name: nginx
|
||||||
volumes:
|
volumes:
|
||||||
- /srv/data/nginx/templates:/etc/nginx/templates:ro
|
- /srv/data/nginx/templates:/etc/nginx/templates:ro
|
||||||
@@ -9,7 +9,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
BASE_DOMAIN: ${BASE_DOMAIN}
|
BASE_DOMAIN: ${BASE_DOMAIN}
|
||||||
EO_ORIGIN_TOKEN: ${EO_ORIGIN_TOKEN}
|
EO_ORIGIN_TOKEN: ${EO_ORIGIN_TOKEN}
|
||||||
NGINX_ENVSUBST_FILTER: '^(BASE_DOMAIN|EO_ORIGIN_TOKEN)$'
|
NGINX_ENVSUBST_FILTER: "^(BASE_DOMAIN|EO_ORIGIN_TOKEN)$"
|
||||||
NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx
|
NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx
|
||||||
ports:
|
ports:
|
||||||
- "192.168.10.101:80:80"
|
- "192.168.10.101:80:80"
|
||||||
@@ -32,6 +32,8 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.05"
|
cpus: "0.05"
|
||||||
memory: 16M
|
memory: 16M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
acme-sh:
|
acme-sh:
|
||||||
image: neilpang/acme.sh:3.1.4
|
image: neilpang/acme.sh:3.1.4
|
||||||
container_name: acme.sh
|
container_name: acme.sh
|
||||||
@@ -52,6 +54,8 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.05"
|
cpus: "0.05"
|
||||||
memory: 16M
|
memory: 16M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
name: proxy
|
name: proxy
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
name: openlist
|
name: openlist
|
||||||
services:
|
services:
|
||||||
openlist:
|
openlist:
|
||||||
image: openlistteam/openlist:v4.2.6
|
image: openlistteam/openlist:v4.2.7
|
||||||
container_name: openlist
|
container_name: openlist
|
||||||
volumes:
|
volumes:
|
||||||
- /srv/data/openlist:/opt/openlist/data
|
- /srv/data/openlist:/opt/openlist/data
|
||||||
@@ -14,6 +14,8 @@ services:
|
|||||||
- proxy
|
- proxy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
user: 1000:1000
|
user: 1000:1000
|
||||||
|
cap_drop:
|
||||||
|
- ALL
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
@@ -22,6 +24,8 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.2"
|
cpus: "0.2"
|
||||||
memory: 64M
|
memory: 64M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
@@ -8,11 +8,11 @@ services:
|
|||||||
- /srv/data/qbittorrent/downloads:/downloads
|
- /srv/data/qbittorrent/downloads:/downloads
|
||||||
- /srv/fast/qbittorrent:/opt/openlist/data/temp/qBittorrent
|
- /srv/fast/qbittorrent:/opt/openlist/data/temp/qBittorrent
|
||||||
environment:
|
environment:
|
||||||
- PUID=1000
|
PUID: "1000"
|
||||||
- PGID=1000
|
PGID: "1000"
|
||||||
- TZ=Asia/Shanghai
|
TZ: Asia/Shanghai
|
||||||
- WEBUI_PORT=8080
|
WEBUI_PORT: "8080"
|
||||||
- TORRENTING_PORT=6881
|
TORRENTING_PORT: "6881"
|
||||||
ports:
|
ports:
|
||||||
- "6881:6881/tcp"
|
- "6881:6881/tcp"
|
||||||
- "6881:6881/udp"
|
- "6881:6881/udp"
|
||||||
@@ -24,6 +24,8 @@ services:
|
|||||||
limits:
|
limits:
|
||||||
cpus: "1.0"
|
cpus: "1.0"
|
||||||
memory: 2G
|
memory: 2G
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
networks:
|
networks:
|
||||||
proxy:
|
proxy:
|
||||||
external: true
|
external: true
|
||||||
@@ -21,3 +21,5 @@ services:
|
|||||||
reservations:
|
reservations:
|
||||||
cpus: "0.2"
|
cpus: "0.2"
|
||||||
memory: 128M
|
memory: 128M
|
||||||
|
security_opt:
|
||||||
|
- no-new-privileges:true
|
||||||
Reference in new issue
Block a user