diff --git a/Dockerfile b/Dockerfile index 8461a71..e68ef5d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,9 @@ -# 构建阶段:Maven + JDK 17 编译,生成薄 jar 及依赖 -FROM maven:3.9-eclipse-temurin-17-alpine AS builder +FROM registry.bjzgzp.com:4433/library/eclipse-temurin:21-jdk-ubi10-minimal + WORKDIR /app -# 优先复制 pom.xml 利用 Docker 层缓存(依赖不变时跳过 go-offline) -COPY pom.xml . -RUN mvn dependency:go-offline -q +COPY ./target/label-backend-1.0.0-SNAPSHOT.jar /app/label-backend-1.0.0-SNAPSHOT.jar -COPY src ./src -RUN mvn clean package -DskipTests -q +EXPOSE 18082 -# 运行阶段:仅含 JRE 的精简镜像 -FROM eclipse-temurin:17-jre-alpine -WORKDIR /app - -# 复制部署结构:bin/ libs/ etc/ -COPY --from=builder /app/scripts/start.sh bin/start.sh -COPY --from=builder /app/target/libs/ libs/ -COPY --from=builder /app/src/main/resources/application.yml etc/application.yml -COPY --from=builder /app/src/main/resources/logback.xml etc/logback.xml - -RUN mkdir -p logs && chmod +x bin/start.sh - -EXPOSE 8080 - -# start.sh 检测到 /.dockerenv 后以 exec 前台方式运行 -ENTRYPOINT ["bin/start.sh"] +ENTRYPOINT ["java", "-Djava.net.preferIPv4Stack=true", "-jar", "/app/label-backend-1.0.0-SNAPSHOT.jar"] \ No newline at end of file diff --git a/pom.xml b/pom.xml index a397ece..deffed4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,18 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.1.5 - - + com.label label-backend 1.0.0-SNAPSHOT jar + 21 + 3.1.5 UTF-8 42.2.24 3.5.3.1 @@ -23,6 +20,15 @@ + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + software.amazon.awssdk @@ -132,72 +138,32 @@ - - - src/main/resources - - sql/** - *.yml - *.xml - *.yaml - *.properties - - - org.apache.maven.plugins - maven-jar-plugin + maven-compiler-plugin + 3.11.0 - ${project.build.directory}/libs - - - com.label.LabelBackendApplication - true - ./ - - - ../etc/ - - + ${java.version} + ${java.version} + + + org.projectlombok + lombok + 1.18.30 + + - - org.apache.maven.plugins - maven-dependency-plugin + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} - copy-dependencies - package - copy-dependencies + repackage - - ${project.build.directory}/libs - runtime - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - create-distribution - package - - single - - - - assembly/distribution.xml - - ${project.artifactId}-${project.version} - false - diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9e4eaec..bea0b1d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,6 @@ server: port: 8080 + port: 18082 spring: application: @@ -60,7 +61,7 @@ rustfs: region: us-east-1 ai-service: - base-url: ${AI_SERVICE_BASE_URL:http://localhost:8000} + base-url: ${AI_SERVICE_BASE_URL:http://39.107.112.174:18000} timeout: 30000 auth: