From fe0f26550e12636d32451c7767d51229096106d9 Mon Sep 17 00:00:00 2001 From: zengwei Date: Wed, 27 Dec 2023 19:17:58 +0800 Subject: [PATCH] update --- jupyterlab/docker-compose-tensor.yml | 11 +++++++++++ jupyterlab/docker-compose.yml | 11 +++++++++++ jupyterlab/nginx.conf | 27 +++++++++++++++++++++++++++ jupyterlab/readme.md | 1 + mongodb/docker-compose.yml | 13 +++++++------ rancher/docker-compose.yml | 16 ++++++++++++++++ redis/conf/redis.conf | 2 +- srs/docker-compose.yml | 12 ++++++++++++ srs/readme.md | 1 + ubuntu_services/readme.md | 1 + ubuntu_services/rtsp2rtmp.service | 10 ++++++++++ ubuntu_services/rtsp2rtmp.sh | 6 ++++++ ubuntu_services/rtspSave.service | 10 ++++++++++ ubuntu_services/rtspSave.sh | 6 ++++++ 14 files changed, 120 insertions(+), 7 deletions(-) create mode 100644 jupyterlab/docker-compose-tensor.yml create mode 100644 jupyterlab/docker-compose.yml create mode 100644 jupyterlab/nginx.conf create mode 100644 jupyterlab/readme.md create mode 100644 rancher/docker-compose.yml create mode 100644 srs/docker-compose.yml create mode 100644 srs/readme.md create mode 100644 ubuntu_services/readme.md create mode 100644 ubuntu_services/rtsp2rtmp.service create mode 100644 ubuntu_services/rtsp2rtmp.sh create mode 100644 ubuntu_services/rtspSave.service create mode 100644 ubuntu_services/rtspSave.sh diff --git a/jupyterlab/docker-compose-tensor.yml b/jupyterlab/docker-compose-tensor.yml new file mode 100644 index 0000000..6c2c4ea --- /dev/null +++ b/jupyterlab/docker-compose-tensor.yml @@ -0,0 +1,11 @@ +version: '3' + +services: + jupyter: + image: jupyter/tensorflow-notebook:latest + ports: + - "8888:8888" + volumes: + - ./notebooks:/home/jovyan/work + environment: + - JUPYTER_ENABLE_LAB=yes diff --git a/jupyterlab/docker-compose.yml b/jupyterlab/docker-compose.yml new file mode 100644 index 0000000..bd48963 --- /dev/null +++ b/jupyterlab/docker-compose.yml @@ -0,0 +1,11 @@ +version: '3' + +services: + jupyter: + image: jupyter/scipy-notebook:latest + ports: + - "8888:8888" + volumes: + - ./notebooks:/home/jovyan/work + environment: + - JUPYTER_ENABLE_LAB=yes diff --git a/jupyterlab/nginx.conf b/jupyterlab/nginx.conf new file mode 100644 index 0000000..85e7fe3 --- /dev/null +++ b/jupyterlab/nginx.conf @@ -0,0 +1,27 @@ + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name jupyter.windymuse.com.cn; + + ssl_certificate /root/ssl/windymuse.com.cn/fullchain.crt; + ssl_certificate_key /root/ssl/windymuse.com.cn/private.pem; + + ssl_session_timeout 10m; + ssl_ciphers HIGH:!aNULL:!MD5; + ssl_prefer_server_ciphers on; + client_max_body_size 100m; + + location / { + proxy_pass http://localhost:8888; + proxy_http_version 1.1; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_read_timeout 3600s; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + } + +} \ No newline at end of file diff --git a/jupyterlab/readme.md b/jupyterlab/readme.md new file mode 100644 index 0000000..29ee4e9 --- /dev/null +++ b/jupyterlab/readme.md @@ -0,0 +1 @@ +jupyter使用了wss，nginx需要相应配置，否则连接不上内核，会报错误400 \ No newline at end of file diff --git a/mongodb/docker-compose.yml b/mongodb/docker-compose.yml index e2df783..a760e58 100644 --- a/mongodb/docker-compose.yml +++ b/mongodb/docker-compose.yml @@ -6,24 +6,25 @@ services: image: mongo:4.4.14 restart: always ports: - - 27017:27017 + - 27027:27017 volumes: - ./data/db:/data/db - ./data/log:/var/log/mongodb - ./data/config:/etc/mongo environment: - - MONGO_INITDB_ROOT_USERNAME=admin - - MONGO_INITDB_ROOT_PASSWORD=admin + - MONGO_INITDB_ROOT_USERNAME=fsdhxfvd + - MONGO_INITDB_ROOT_PASSWORD=tXopAEkUmyYQnfUetb9b mongo-express: image: mongo-express:0.54.0 container_name: mongo-express restart: always ports: - - 8081:8081 + - 8091:8081 environment: - - ME_CONFIG_MONGODB_ADMINUSERNAME=root - - ME_CONFIG_MONGODB_ADMINPASSWORD=root + - ME_CONFIG_MONGODB_ADMINUSERNAME=fsdhxfvd + - ME_CONFIG_MONGODB_ADMINPASSWORD=tXopAEkUmyYQnfUetb9b - ME_CONFIG_MONGODB_SERVER=mongodb + - ME_CONFIG_MONGODB_PORT=27027 networks: default: diff --git a/rancher/docker-compose.yml b/rancher/docker-compose.yml new file mode 100644 index 0000000..4e9f9a8 --- /dev/null +++ b/rancher/docker-compose.yml @@ -0,0 +1,16 @@ +version: '3' +services: + rancher: + restart: always + privileged: true + image: rancher/rancher:latest + container_name: rancher + volumes: + - ./data:/var/lib/rancher + environment: + - TZ=Asia/Shanghai + - CATTLE_BOOTSTRAP_PASSWORD=admin123456 + ports: + - 80:80 + - 443:443 + - 8080:8080 diff --git a/redis/conf/redis.conf b/redis/conf/redis.conf index f440e3d..42e754b 100644 --- a/redis/conf/redis.conf +++ b/redis/conf/redis.conf @@ -57,7 +57,7 @@ logfile /logs/redis.log # 设置数据库的数量，默认数据库为0，可以使用select 命令在连接上指定数据库id # dbid是从0到‘databases’-1的数目 -databases 16 +databases 128 ################################ SNAPSHOTTING ################################# # 指定在多长时间内，有多少次更新操作，就将数据同步到数据文件，可以多个条件配合 diff --git a/srs/docker-compose.yml b/srs/docker-compose.yml new file mode 100644 index 0000000..6ead0d9 --- /dev/null +++ b/srs/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.8' # 使用docker-compose的版本3.8，您可以根据需要使用其他版本 +services: + srs: + image: registry.cn-hangzhou.aliyuncs.com/ossrs/srs:5 # 使用的镜像 + container_name: srs # 容器名称，可选 + restart: unless-stopped # 如果不是手动停止，则总是重启容器 + ports: + - "1935:1935" # 映射1935端口 + - "1985:1985" # 映射1985端口 + - "8081:8080" # 映射8080端口到宿主机的8081端口 + tty: true # 分配一个伪tty，相当于docker run的-t选项 + stdin_open: true # 保持stdin开放，相当于docker run的-i选项 diff --git a/srs/readme.md b/srs/readme.md new file mode 100644 index 0000000..255a74a --- /dev/null +++ b/srs/readme.md @@ -0,0 +1 @@ +docker run --rm -itd -p 1935:1935 -p 1985:1985 -p 8081:8080 registry.cn-hangzhou.aliyuncs.com/ossrs/srs:5 \ No newline at end of file diff --git a/ubuntu_services/readme.md b/ubuntu_services/readme.md new file mode 100644 index 0000000..97b0d6e --- /dev/null +++ b/ubuntu_services/readme.md @@ -0,0 +1 @@ +service文件应该放在 /etc/systemd/system 目录下 \ No newline at end of file diff --git a/ubuntu_services/rtsp2rtmp.service b/ubuntu_services/rtsp2rtmp.service new file mode 100644 index 0000000..d40c0ce --- /dev/null +++ b/ubuntu_services/rtsp2rtmp.service @@ -0,0 +1,10 @@ +[Unit] +Description=rtsp2rtmp service + +[Service] +Type=simple +ExecStart=/usr/local/bin/rtsp2rtmp.sh +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/ubuntu_services/rtsp2rtmp.sh b/ubuntu_services/rtsp2rtmp.sh new file mode 100644 index 0000000..4e94b5a --- /dev/null +++ b/ubuntu_services/rtsp2rtmp.sh @@ -0,0 +1,6 @@ +#!/bin/sh +while true; do + ffmpeg -rtsp_transport tcp -stimeout 5000000 -i "rtsp://admin:user_123@192.168.31.64:554" -vcodec libx264 -acodec aac -f flv rtmp://192.168.31.250/live/hls + echo "Stream disconnected, reconnecting..." + sleep 1 +done diff --git a/ubuntu_services/rtspSave.service b/ubuntu_services/rtspSave.service new file mode 100644 index 0000000..9e0a13e --- /dev/null +++ b/ubuntu_services/rtspSave.service @@ -0,0 +1,10 @@ +[Unit] +Description=rtspSave service + +[Service] +Type=simple +ExecStart=/usr/local/bin/rtspSave.sh +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/ubuntu_services/rtspSave.sh b/ubuntu_services/rtspSave.sh new file mode 100644 index 0000000..6578c4a --- /dev/null +++ b/ubuntu_services/rtspSave.sh @@ -0,0 +1,6 @@ +#!/bin/sh +while true; do + ffmpeg -rtsp_transport tcp -stimeout 5000000 -i "rtsp://admin:user_123@192.168.31.64:554" -vcodec copy -t 500 -f segment -segment_time 1200 -segment_format mp4 -strftime 1 "/root/records/output_%Y-%m-%d_%H-%M.mp4" + echo "Stream disconnected, reconnecting..." + sleep 1 +done