|
@@ -132,17 +132,18 @@ services:
|
|
|
# - taphole
|
|
|
|
|
|
|
|
|
- # nginx:
|
|
|
- # image: nginx:1.22
|
|
|
- # container_name: taphole-nginx
|
|
|
- # volumes:
|
|
|
- # - ./nginx/conf:/etc/nginx #配置文件目录挂载
|
|
|
- # - ./nginx/html:/usr/share/nginx/html #静态资源根目录挂载
|
|
|
- # - ./nginx/logs:/var/log/nginx #日志文件目录挂载
|
|
|
- # ports:
|
|
|
- # - 5080:80
|
|
|
- # networks:
|
|
|
- # - taphole
|
|
|
+ nginx:
|
|
|
+ image: nginx:latest
|
|
|
+ container_name: taphole-nginx
|
|
|
+ volumes:
|
|
|
+ - ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf #配置文件目录挂载
|
|
|
+ - ./nginx/conf/default.conf:/etc/nginx/default.conf #配置文件目录挂载
|
|
|
+ - ./nginx/html:/etc/nginx/html #静态资源根目录挂载
|
|
|
+ - ./nginx/logs:/var/log/nginx #日志文件目录挂载
|
|
|
+ ports:
|
|
|
+ - 15080:80
|
|
|
+ networks:
|
|
|
+ - taphole
|
|
|
|
|
|
app:
|
|
|
image: taphole-app:latest
|
|
@@ -158,7 +159,7 @@ services:
|
|
|
- /home/xiaofei/uploads/taphole/:/home/xiaofei/uploads/taphole/ #映射资源目录
|
|
|
# - /usr/local/ffmpeg/bin:/usr/local/ffmpeg/bin
|
|
|
ports:
|
|
|
- - "48080:8080"
|
|
|
+ - "28080:8080"
|
|
|
- "33000:33000"
|
|
|
environment:
|
|
|
- PREFER_HOST_MODE=hostname
|
|
@@ -172,4 +173,5 @@ services:
|
|
|
- redis
|
|
|
- zlmediakit
|
|
|
networks:
|
|
|
- - taphole
|
|
|
+ taphole:
|
|
|
+ ipv4_address: 172.28.1.100
|