diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c73f4d0..5112cb7 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -47,7 +47,6 @@ services: - "6379:6379" volumes: - ./redis/conf/redis.conf:/home/ruoyi/redis/redis.conf - - ./redis/data:/data command: redis-server /home/ruoyi/redis/redis.conf ruoyi-nginx: container_name: ruoyi-nginx diff --git a/docker/redis/dockerfile b/docker/redis/dockerfile index e713407..7e58c43 100644 --- a/docker/redis/dockerfile +++ b/docker/redis/dockerfile @@ -3,11 +3,17 @@ FROM registry.t-aaron.com/redis:latest # author MAINTAINER ruoyi +# 创建用户和组 +RUN groupadd -r ruoyi && useradd -r -g ruoyi ruoyi + # 挂载目录 VOLUME /home/ruoyi/redis -# 创建目录 -RUN mkdir -p /home/ruoyi/redis +# 创建目录并设置权限 +RUN mkdir -p /home/ruoyi/redis && chown -R ruoyi:ruoyi /home/ruoyi/redis && chmod -R 755 /home/ruoyi/redis # 指定路径 WORKDIR /home/ruoyi/redis # 复制conf文件到路径 COPY ./conf/redis.conf /home/ruoyi/redis/redis.conf + +# 切换到ruoyi用户 +USER ruoyi diff --git a/docker/zlmmediakit/.env.default b/docker/zlmmediakit/.env.default index 8159c0f..dfbfa07 100644 --- a/docker/zlmmediakit/.env.default +++ b/docker/zlmmediakit/.env.default @@ -1,12 +1,9 @@ -# 端口配置 RTMP_PORT=1935 -HTTP_PORT=8080 +HTTP_PORT=9090 HTTPS_PORT=8443 RTSP_PORT=8554 RTP_TCP_PORT=10000 RTP_UDP_PORT=10000 WEBRTC_UDP_PORT1=8000 WEBRTC_UDP_PORT2=9000 - -# 重启策略 -RESTART_POLICY=unless-stopped \ No newline at end of file +RESTART_POLICY=unless-stopped diff --git a/docker/zlmmediakit/docker-compose.yml b/docker/zlmmediakit/docker-compose.yml index 2b66e46..e912472 100644 --- a/docker/zlmmediakit/docker-compose.yml +++ b/docker/zlmmediakit/docker-compose.yml @@ -1,7 +1,7 @@ # 此镜像为github持续集成自动编译推送,跟代码(master分支)保持最新状态 services: zlmediakit: - image: registry.t-aaron.com/zlmediakit/zlmediakit + image: registry.t-aaron.com/zlmediakit/zlmediakit:Release.latest container_name: zlmediakit restart: unless-stopped ports: