diff --git a/.drone.yml b/.drone.yml index 228decd..55fd88d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -180,7 +180,7 @@ steps: path: /var/run/docker.sock commands: - docker info - - docker build -t ${DRONE_REPO_NAME}-frontend:latest -f vue-ui/Dockerfile vue-ui + - docker build -t ${DRONE_REPO_NAME}-frontend:latest -f docker/Dockerfile-frontend vue-ui - docker tag ${DRONE_REPO_NAME}-frontend:latest ${DRONE_REPO_NAME}-frontend:${DRONE_COMMIT_SHA:0:8} - docker images ${DRONE_REPO_NAME}-frontend depends_on: @@ -202,7 +202,7 @@ steps: fi echo "📦 Building Docker image: ${DRONE_REPO_NAME}:latest" ls -lh target/drone-test-1.0.jar - docker build -t ${DRONE_REPO_NAME}:latest -f Dockerfile . + docker build -t ${DRONE_REPO_NAME}:latest -f docker/Dockerfile . docker tag ${DRONE_REPO_NAME}:latest ${DRONE_REPO_NAME}:${DRONE_COMMIT_SHA:0:8} docker images ${DRONE_REPO_NAME} depends_on: diff --git a/Dockerfile b/docker/Dockerfile similarity index 100% rename from Dockerfile rename to docker/Dockerfile diff --git a/vue-ui/Dockerfile b/docker/Dockerfile-frontend similarity index 97% rename from vue-ui/Dockerfile rename to docker/Dockerfile-frontend index fa7a337..0b9fdbe 100644 --- a/vue-ui/Dockerfile +++ b/docker/Dockerfile-frontend @@ -11,7 +11,7 @@ RUN npm config set registry https://registry.npmmirror.com \ && npm ci --no-audit --no-fund # 复制源码并构建 -COPY . . +COPY ../vue-ui . RUN npm run build # 运行阶段,使用独立 nginx 镜像