diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100755 index 0000000..b6aa781 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "RTT_Studio.Build.Parallel_Jobs": "8" +} \ No newline at end of file diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 index eceb41a..a2afcd7 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,9 +13,12 @@ services: volumes: # 映射主机./conf.d目录到容器/etc/nginx/conf.d目录 - "$PWD/nginx/conf.d:/etc/nginx/conf.d" - - "/sharedfolders/hd2/web/80:/var/www/html" + - "/srv/hd/pub/web/80:/var/www/html" networks: - web_net + # networks: + # web_net: + # ipv4_address: 192.168.222.120 # 容器名称 container_name: "web_nginx" php: @@ -25,7 +28,7 @@ services: # ports: # - "9000:9000" volumes: - - "/sharedfolders/hd2/web/80:/var/www/html" + - "/srv/hd/pub/web/80:/var/www/html" networks: - web_net container_name: "php-fpm" @@ -42,11 +45,19 @@ services: # # 固定子网ip,网段必须在子网络192.168.8.* # ipv4_address: 192.168.8.6 # container_name: "compose-mysql" + networks: # 配置docker network web_net: - driver: bridge - # ipam: - # config: - # # 子网络 - # - subnet: 192.168.8.0/24 + +# networks: +# # 配置docker network +# web_net: +# driver: macvlan +# driver_opts: +# parent: ens18 +# ipam: +# driver: default +# config: +# - subnet: 192.168.222.0/23 +# gateway: 192.168.222.254 \ No newline at end of file diff --git a/nginx/conf.d/default.conf b/nginx/conf.d/default.conf old mode 100644 new mode 100755 diff --git a/php-mysql/Dockerfile b/php-mysql/Dockerfile old mode 100644 new mode 100755