修复权限管理,角色认证,更新工单认领系统,增加表格导出支持区间选择,增加docker管理(开发中
This commit is contained in:
@@ -4,17 +4,19 @@ services:
|
||||
volumes:
|
||||
- ./www:/usr/share/nginx/html
|
||||
- ./www/php-fpm/www.conf:/usr/local/etc/php-fpm.d/www.conf
|
||||
command: >
|
||||
sh -c "apk add --no-cache $PHPIZE_DEPS && docker-php-ext-install mysqli pdo_mysql && apk del $PHPIZE_DEPS && php-fpm"
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
group_add:
|
||||
- "994"
|
||||
command: sh -c "apk add --no-cache docker-cli; addgroup -g 994 docker; addgroup www-data docker; docker-php-ext-install mysqli pdo_mysql; exec php-fpm"
|
||||
|
||||
nginx:
|
||||
image: nginx:stable-alpine
|
||||
ports:
|
||||
- "8080:80"
|
||||
volumes:
|
||||
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf:ro
|
||||
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf
|
||||
- /var/run/docker.sock:/var/run/docker.sock
|
||||
- ./www:/usr/share/nginx/html
|
||||
depends_on:
|
||||
- php
|
||||
# 使用nc探测tcp端口,不再用wget(wget不兼容fastcgi)
|
||||
command: ["/bin/sh", "-c", "until nc -z php 9000; do echo '等待php-fpm端口就绪...'; sleep 1; done; nginx -g 'daemon off;'"]
|
||||
|
||||
Reference in New Issue
Block a user