diff --git a/custom.env.example b/custom.env.example index ed2c4c4..321047f 100644 --- a/custom.env.example +++ b/custom.env.example @@ -6,6 +6,7 @@ # genery TZ=Asia/Shanghai +VOLUME_PATH=/mnt/volume # docker build args ARGS_APK_MIRROR='mirrors.aliyun.com' @@ -31,6 +32,10 @@ SMB_PATH_TMP=/mnt/share/tmp # tmpfs # drwxrwxr-x guest share-public # SMB_PATH_TMP's owner should be same as SMB_PATH_PUBLIC's # SMB_PATH_PUBLIC's owner will be the SMB guest user +# speedtest +SPEED_TITLE=LibreSpeed +SPEED_PASSWD=12345678 + # media - jellyfin MEDIA_PATH=/mnt/jellyfin/media diff --git a/docker-compose.gen b/docker-compose.gen index a3114dc..3a68483 100755 --- a/docker-compose.gen +++ b/docker-compose.gen @@ -12,6 +12,10 @@ gid_of() { getent group "$1" | cut -d':' -f3 } +# network +BRIDGE_SUBNET='172.16.10.0/24' +DNS_IP='172.16.10.53' + # samba/wsdd service SMB_GID_PRIVATE=$(stat -c '%g' "${SMB_PATH_PRIVATE}") SMB_GID_PROTECT=$(stat -c '%g' "${SMB_PATH_PROTECT}") @@ -22,15 +26,32 @@ SMB_UID_ADMIN=$(id -u ${SMB_UNAME_ADMIN}) # media(jellyfin) service MEDIA_UGID=$(stat -c '%u:%g' "${MEDIA_PATH}") -_VIDEO_DEV='/dev/dri/renderD128' -if [ -c "${_VIDEO_DEV}" ]; then - MEDIA_GID_RENDER=$(stat -c '%g' "${_VIDEO_DEV}") +DEV_DRI_RENDER='/dev/dri/renderD128' +if [ -c "${DEV_DRI_RENDER}" ]; then + MEDIA_GID_RENDER=$(stat -c '%g' "${DEV_DRI_RENDER}") fi cat <<-EOF >docker-compose.yml version: '3' services: + smartdns: + image: "sigkill.top/smartdns" + build: + context: ./smartdns + args: + - ALPINE_VERSION=${ARGS_ALPINE_VERSION} + - APK_MIRROR=${ARGS_APK_MIRROR} + networks: + localnet: + ipv4_address: ${DNS_IP} + ports: + - 53:53/udp + - 53:53/tcp + volumes: + - smartdns_cache:/smartdns + restart: unless-stopped + proxy: image: "sigkill.top/proxy" build: @@ -44,9 +65,15 @@ services: - NMP_TOKEN=${PROXY_NMP_TOKEN} networks: - localnet + dns: + - ${DNS_IP} ports: - ${PROXY_SOCKS_PORT}:10086 - - ${PROXY_HTTP_PORT}:10080 +# - ${PROXY_HTTP_PORT}:10080 + - 20080:20080 + - 20086:20086 + depends_on: + - smartdns restart: unless-stopped samba: @@ -98,6 +125,9 @@ services: args: - NGINX_VERSION=${ARGS_NGINX_VERSION} - APK_MIRROR=${ARGS_APK_MIRROR} + environment: + - TITLE:${SPEED_TITLE} + - PASSWORD:${SPEED_PASSWD} networks: - localnet ports: @@ -118,7 +148,8 @@ services: user: ${MEDIA_UGID} group_add:$( \ if [ -n "${MEDIA_GID_RENDER}" ]; then - echo " - ${MEDIA_GID_RENDER}" + echo + echo " - \"${MEDIA_GID_RENDER}\"" fi)$( \ for GNAME in "${MEDIA_GNAME_EXTRA[@]}"; do echo @@ -130,14 +161,22 @@ services: echo " - JELLYFIN_PublishedServerUrl=${MEDIA_PUBLISHED_URL}" fi) network_mode: host + dns: + - ${DNS_IP} volumes: - - jellyfin_config:/config - - jellyfin_cache:/cache - - ${MEDIA_PATH}:/media$( \ - if [ -c "${_VIDEO_DEV}" ]; then - echo ' devices:' + - ${VOLUME_PATH}/jellyfin/config:/config + - ${VOLUME_PATH}/jellyfin/cache:/cache + - ${MEDIA_PATH}:/media + devices:$( \ + if [ -c "${DEV_DRI_RENDER}" ]; then + echo echo ' - /dev/dri:/dev/dri' - fi) + fi)$( \ + ls /dev/video* >/dev/null 2>&1 && echo && for dev in /dev/video*; do + echo " - $dev:$dev" + done) + depends_on: + - smartdns restart: unless-stopped motd: @@ -151,8 +190,12 @@ services: - TZ=${TZ:-Asia/Shanghai} networks: - localnet + dns: + - ${DNS_IP} volumes: - motd_data:/mnt/motd + depends_on: + - smartdns restart: unless-stopped $(for CONF in ${ARIA2_CONFS[@]}; do @@ -172,6 +215,8 @@ $(for CONF in ${ARIA2_CONFS[@]}; do - localnet volumes: - ${SRV_PATH}:/mnt/downloads + depends_on: + - smartdns restart: unless-stopped EOF_ARIA2 done) @@ -183,10 +228,9 @@ networks: ipam: driver: default config: - - subnet: "172.16.10.0/24" + - subnet: "${BRIDGE_SUBNET}" Internal Server Error - docker-home - Oxfs Git Repo

500


Gitea Version: 1.15.7