diff --git a/.drone.yml b/.drone.yml index 2b9d785..b098f43 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,6 +39,21 @@ steps: - name: docker path: /var/run/docker.sock commands: + - # 停止容器(如果存在) + - docker inspect --type=container yudao-gateway >/dev/null 2>&1 && docker stop yudao-gateway || true + - docker inspect --type=container yudao-module-system >/dev/null 2>&1 && docker stop yudao-module-system || true + - docker inspect --type=container yudao-module-infra >/dev/null 2>&1 && docker stop yudao-module-infra || true + + - # 删除容器(如果存在) + - docker inspect --type=container yudao-gateway >/dev/null 2>&1 && docker rm yudao-gateway || true + - docker inspect --type=container yudao-module-system >/dev/null 2>&1 && docker rm yudao-module-system || true + - docker inspect --type=container yudao-module-infra >/dev/null 2>&1 && docker rm yudao-module-infra || true + + - # 删除镜像(如果存在) + - docker inspect --type=image yudao-gateway >/dev/null 2>&1 && docker rmi yudao-gateway || true + - docker inspect --type=image yudao-module-system >/dev/null 2>&1 && docker rmi yudao-module-system || true + - docker inspect --type=image yudao-module-infra >/dev/null 2>&1 && docker rmi yudao-module-infra || true + - cd /home/app/build - cd gateway && docker build -t yudao-gateway:${APP_VERSION} -f ../Dockerfile . - cd ../system && docker build -t yudao-module-system:${APP_VERSION} -f ../Dockerfile . diff --git a/Dockerfile b/Dockerfile index d2a72cc..3393a02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,4 @@ WORKDIR /home/app COPY app.jar app.jar -ENTRYPOINT ["java", "-jar", "app.jar", "--spring.profiles.active=prod"] +ENTRYPOINT ["java", "-jar", "app.jar", "--spring.profiles.active=dev"] diff --git a/docker-compose.yml b/docker-compose.yml index 9f5b6fc..245d54d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.8' services: gateway: image: yudao-gateway:${APP_VERSION} - container_name: yudao-gatewa + container_name: yudao-gateway ports: - "48080:48080" environment: