diff --git a/build-and-push.sh b/build-and-push.sh index ceee51e..aa6184d 100644 --- a/build-and-push.sh +++ b/build-and-push.sh @@ -30,7 +30,11 @@ for service in "${SERVICES[@]}"; do # 构建Docker镜像 echo "正在构建镜像: $IMAGE_NAME" - docker build -t $IMAGE_NAME $SERVICE_DIR + if [ "$service" = "frontend" ]; then + docker build --build-arg CACHEBUST=$(date +%s) -t $IMAGE_NAME $SERVICE_DIR + else + docker build -t $IMAGE_NAME $SERVICE_DIR + fi if [ $? -ne 0 ]; then echo "镜像构建失败" exit 1 diff --git a/docker-compose.aliyun.yml b/docker-compose.aliyun.yml index d3d3772..a98841a 100644 --- a/docker-compose.aliyun.yml +++ b/docker-compose.aliyun.yml @@ -108,6 +108,7 @@ services: frontend: image: crpi-amr0dt5e5pywqwaf.cn-hangzhou.personal.cr.aliyuncs.com/testrrr/frontend:latest + pull_policy: always container_name: ari-frontend restart: always depends_on: diff --git a/services/frontend/Dockerfile b/services/frontend/Dockerfile index fc9f0ef..28f6302 100644 --- a/services/frontend/Dockerfile +++ b/services/frontend/Dockerfile @@ -3,7 +3,7 @@ WORKDIR /app COPY package*.json ./ RUN npm install COPY . . -RUN npm run build +RUN echo "Cachebust: $CACHEBUST" && npm run build FROM nginx:stable-alpine as production-stage COPY --from=build-stage /app/dist /usr/share/nginx/html