diff --git a/Makefile b/Makefile index 1139cfe2..70dcbee2 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ ImageTag ?=v0.9.6 -SoybeanImg ?= soybean/soybean:$(ImageTag) +SoybeanAdminImg ?= soybeanjs/soybean-admin:$(ImageTag) VERSION=$(shell git rev-parse --short HEAD) -soybean: soybean-build soybean-push +soybean-admin: soybean-admin-build soybean-admin-push -soybean-build: - docker build --build-arg version=$(VERSION) -t ${SoybeanImg} -f build/docker/Dockerfile . +soybean-admin-build: + docker build --build-arg version=$(VERSION) -t ${SoybeanAdminImg} -f docker/Dockerfile . -soybean-push: - docker push ${SoybeanImg} +soybean-admin-push: + docker push ${SoybeanAdminImg} diff --git a/README.md b/README.md index 0dbe1cac..c01c60f2 100644 --- a/README.md +++ b/README.md @@ -120,10 +120,10 @@ pnpm build - Docker 部署 Soybean ```bash -docker run --name soybean -p 80:80 -d soybean/soybean:v0.9.6 +docker run --name soybean -p 80:80 -d soybeanjs/soybean-admin:v0.9.6 ``` -- 访问 Soybean +- 访问 SoybeanAdmin 打开本地浏览器访问`http://localhost` diff --git a/build/docker/.dockerignore b/docker/.dockerignore similarity index 100% rename from build/docker/.dockerignore rename to docker/.dockerignore diff --git a/build/docker/Dockerfile b/docker/Dockerfile similarity index 60% rename from build/docker/Dockerfile rename to docker/Dockerfile index 891ba892..ded2f08d 100644 --- a/build/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM node:16.17.0 as builder -ENV WORKDIR=/soybean +ENV WORKDIR=/soybean-admin WORKDIR $WORKDIR @@ -18,7 +18,7 @@ FROM nginx:alpine as prod RUN mkdir /soybean -COPY --from=builder /soybean/dist /soybean -COPY --from=builder /soybean/build/docker/nginx.conf /etc/nginx/nginx.conf +COPY --from=builder /soybean-admin/dist /soybean-admin +COPY --from=builder /soybean-admin/docker/nginx.conf /etc/nginx/nginx.conf EXPOSE 80 diff --git a/build/docker/nginx.conf b/docker/nginx.conf similarity index 98% rename from build/docker/nginx.conf rename to docker/nginx.conf index 23f7d79c..6c896176 100644 --- a/build/docker/nginx.conf +++ b/docker/nginx.conf @@ -27,7 +27,7 @@ http { add_header Cache-Control "private, no-store, no-cache, must-revalidate, proxy-revalidate"; access_log on; } - root /soybean/; + root /soybean-admin/; index index.html index.htm; try_files $uri $uri/ /index.html; }