diff --git a/README.md b/README.md index 82e63f8..afd5766 100644 --- a/README.md +++ b/README.md @@ -30,24 +30,11 @@ See [Vite Configuration Reference](https://vitejs.dev/config/). ./npm run build ``` -### Run web server - -```sh -# start server -./run start -# restart -./run restart -# stop -./run stop -``` - ## 文件说明 |文件|说明| |---|---| |docker-compose.yml|docker编排文件,里面可以定义端口、工作目录等| |docker-entrypoint.sh|可以被映射到容器中的`/usr/local/bin/docker-entrypoint.sh`,定义容器启动后会自动执行的任务| -|docker.conf|其中定义容器名称和镜像版本,`npm`脚本、`run`脚本、`docker-compose.yml`文件都依赖这个文件| |nginx.conf|可以被映射到容器中的`/usr/local/openresty/nginx/conf/nginx.conf`,容器中nginx服务的配置文件| |npm|可以执行容器中的npm命令的自动化脚本,使用方法与原生npm一致,不过要在前面加上./,如`./npm run dev`| -|run|用于发布场景的、自动执行容器中的`npm run build`并运行nginx服务,通过`./run start`启动容器服务| diff --git a/docker-compose.yml b/docker-compose.yml index f21c206..121aac3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,8 @@ version: "3.1" services: node-resty: - image: wandoubaba517/node-resty:${NODE_IMAGE_VERSION} - container_name: ${NODE_CONTAINER_NAME} - ports: - - 7777:80 + image: wandoubaba517/node-resty:18.18.2 + container_name: node-resty restart: always volumes: - ./docker-entrypoint.sh:/usr/local/bin/docker-entrypoint.sh @@ -14,5 +12,6 @@ services: - ./dist:/usr/local/openresty/nginx/html working_dir: /app/web stdin_open: true + network_mode: host # command: ["npm", "run", "build"] diff --git a/docker.conf b/docker.conf deleted file mode 100644 index 9466d9a..0000000 --- a/docker.conf +++ /dev/null @@ -1,2 +0,0 @@ -container_name=node-resty -image_version=18.18.2 \ No newline at end of file diff --git a/nginx.conf b/nginx.conf index 81f86a0..58b3f64 100644 --- a/nginx.conf +++ b/nginx.conf @@ -33,7 +33,7 @@ http { #gzip on; server { - listen 80; + listen 8087; server_name localhost; #charset koi8-r; diff --git a/run b/run deleted file mode 100755 index 1e3044b..0000000 --- a/run +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# 读取docker.conf文件 -source docker.conf - -# 设置系统环境变量 -export NODE_CONTAINER_NAME=$container_name -export NODE_IMAGE_VERSION=$image_version - -# 判断NODE_CONTAINER_NAME的docker容器是否存在,如果存在,删除它 -# if docker ps -a --format '{{.Names}}' | grep -q "^$NODE_CONTAINER_NAME$"; then -# docker rm -f $NODE_CONTAINER_NAME -# fi - -if [ $# -eq 0 ]; then - echo "usage: run [start|restart|stop|help]" - exit 1 -fi - -if [ "$1" = "start" ]; then - docker compose run --rm $NODE_CONTAINER_NAME npm --registry https://registry.npm.taobao.org install - docker compose up -d -elif [ "$1" = "restart" ]; then - docker rm -f $NODE_CONTAINER_NAME - # docker compose run --rm $NODE_CONTAINER_NAME npm --registry https://registry.npm.taobao.org install - docker compose up -d -elif [ "$1" = "stop" ]; then - docker rm -f $NODE_CONTAINER_NAME -elif [ "$1" = "help" ]; then - echo "usage: run [start|restart|stop|help]" -else - echo "无效的参数" - echo "usage: run [start|restart|stop|help]" - exit 1 -fi \ No newline at end of file