diff --git a/.drone.yml b/.drone.yml index 2bd7f8c..92c30b4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,7 +12,7 @@ steps: - name: build-output path: /home/app/build commands: - - mvn clean package -DskipTests=true -pl yudao-gateway,ruoyi-modules-system,yudao-module-infra -am + - mvn clean package -DskipTests=true -pl yudao-gateway,yudao-module-system/yudao-module-system-biz,yudao-module-infra/yudao-module-infra-biz -am - name: build-jar image: alpine @@ -21,9 +21,9 @@ steps: path: /home/app/build commands: - mkdir -p /home/app/build/{gateway,system,infra} - - cp yudao-gateway/target/*.jar /home/app/build/gateway/app.jar - - cp yudao-modules-system/target/*.jar /home/app/build/system/app.jar - - cp yudao-module-infra/target/*.jar /home/app/build/file/app.jar + - cp yudao-gateway/target/yudao-gateway.jar /home/app/build/gateway/app.jar + - cp yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /home/app/build/system/app.jar + - cp yudao-module-infra/yudao-module-infra-biz/target//yudao-module-infra-biz.jar /home/app/build/infra/app.jar - cp Dockerfile /home/app/build/ - name: build-docker @@ -35,9 +35,9 @@ steps: path: /var/run/docker.sock commands: - cd /home/app/build - - cd gateway && docker build -t ruoyi-gateway:${APP_VERSION} -f ../Dockerfile . - - cd ../system && docker build -t ruoyi-system:${APP_VERSION} -f ../Dockerfile . - - cd ../infra && docker build -t ruoyi-infra:${APP_VERSION} -f ../Dockerfile . + - cd gateway && docker build -t yudao-gateway:${APP_VERSION} -f ../Dockerfile . + - cd ../system && docker build -t yudao-module-system:${APP_VERSION} -f ../Dockerfile . + - cd ../infra && docker build -t yudao-module-infra:${APP_VERSION} -f ../Dockerfile . - name: deploy-with-compose image: docker/compose:1.29.2 diff --git a/docker-compose.yml b/docker-compose.yml index 566c9f1..9f5b6fc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,24 +2,24 @@ version: '3.8' services: gateway: - image: ruoyi-gateway:${APP_VERSION} - container_name: ruoyi-gateway + image: yudao-gateway:${APP_VERSION} + container_name: yudao-gatewa ports: - "48080:48080" environment: SPRING_PROFILES_ACTIVE: dev system: - image: ruoyi-system:${APP_VERSION} - container_name: ruoyi-system + image: yudao-module-system:${APP_VERSION} + container_name: yudao-module-system ports: - "48081:48081" environment: SPRING_PROFILES_ACTIVE: dev infra: - image: ruoyi-infra:${APP_VERSION} - container_name: ruoyi-infra + image: yudao-module-infra:${APP_VERSION} + container_name: yudao-module-infra ports: - "48082:48082" environment: