diff --git a/backend/Dockerfile b/backend/Dockerfile index 50b32cf..5dcd851 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,8 +1,21 @@ FROM 172.31.127.251:8083/library/compile:1.0.0 as builder -COPY .git .git -COPY src src -COPY pom.xml . -RUN mvn clean package -DskipTests=true +WORKDIR /compile +COPY . . +RUN API_MODULE=$(ls -d *-api 2>/dev/null | head -1) && \ + SVC_MODULE=$(ls -d *-svc 2>/dev/null | head -1) && \ + echo "Packaging all modules..." && \ + mvn clean package -DskipTests && \ + if [ -n "$API_MODULE" ]; then \ + echo "Found API module: $API_MODULE, deploying and packaging..." && \ + mvn deploy -pl "$API_MODULE" -am -DskipTests; \ + fi && \ + if [ -n "$SVC_MODULE" ]; then \ + echo "Found SVC module: $SVC_MODULE, copying from $SVC_MODULE target..." && \ + cp "$SVC_MODULE/target/"*.jar app.jar; \ + else \ + echo "No SVC module found, copying from root target..." && \ + cp target/*.jar app.jar; \ + fi FROM 172.31.127.251:8083/library/java21:1.0.0 @@ -10,7 +23,7 @@ ARG PROJECTCODE ARG PROJECTVERSION LABEL author=wangchuan COPY docker-entrypoint.sh /usr/local/bin/ -COPY --from=builder /target/*.jar $APP_HOME +COPY --from=builder /compile/*.jar $APP_HOME ENV ENV_ACTIVE="prod" \ PROJECT_NAME="${PROJECTCODE}" \ PROJECT_VERSION="${PROJECTVERSION}" \