Explorar o código

fix docker build and compiler config

hushuyu hai 4 meses
pai
achega
a62fffcd62
Modificáronse 3 ficheiros con 17 adicións e 23 borrados
  1. 10 16
      Dockerfile
  2. 1 1
      pom.xml
  3. 6 6
      web/src/main/resources/Dockerfile

+ 10 - 16
Dockerfile

@@ -1,19 +1,13 @@
 FROM maven:3.6.1 AS compile_stage
-ENV PROJECT_NAME app
-ENV WORK_PATH /opt/$PROJECT_NAME
-ENV GIT_BRANCH devcloud-x86
-ENV GIT_URL http://gogs.seec.seecoder.cn/WengPuHong/seecoder-devcloud.git
-WORKDIR $WORK_PATH
-RUN git clone --branch $GIT_BRANCH $GIT_URL .
-RUN mkdir /root/.m2 && cp settings.xml /root/.m2/settings.xml
-RUN mvn clean install -DskipTests -DfinalName=$PROJECT_NAME
-COPY . .
-RUN mvn clean install -DskipTests -DfinalName=$PROJECT_NAME
+ENV PROJECT_NAME=app
+ENV WORK_PATH=/opt/${PROJECT_NAME}
 
-FROM openjdk:8-jre-alpine
-ENV PROJECT_NAME app
-ENV WORK_PATH /opt/$PROJECT_NAME
-WORKDIR /app
-COPY --from=compile_stage $WORK_PATH/web/target/seecoder-devcloud-web-0.1.0.jar .
-CMD ["sh", "-c", "java -Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=n -jar -server /app/seecoder-devcloud-web-0.1.0.jar.jar"]
+WORKDIR ${WORK_PATH}
+COPY . ${WORK_PATH}
+RUN mkdir -p /root/.m2 && cp settings.xml /root/.m2/settings.xml
+RUN mvn clean install -DskipTests -pl web -am
 
+FROM eclipse-temurin:8-jre-alpine
+WORKDIR /app
+COPY --from=compile_stage /opt/app/web/target/seecoder-devcloud-web-0.1.0.jar /app/seecoder-devcloud-web-0.1.0.jar
+CMD ["java", "-server", "-Xdebug", "-Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=n", "-jar", "/app/seecoder-devcloud-web-0.1.0.jar"]

+ 1 - 1
pom.xml

@@ -70,7 +70,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.13.0</version>
+                    <version>3.8.1</version>
                     <configuration>
                         <source>${maven.compiler.source}</source>
                         <target>${maven.compiler.target}</target>

+ 6 - 6
web/src/main/resources/Dockerfile

@@ -1,15 +1,15 @@
 # 用于为学生java8项目打包成镜像的dockerfile
 FROM maven:3.6.1 AS compile_stage
-ENV PROJECT_NAME seecoder-paas
-ENV WORK_PATH /opt/$PROJECT_NAME
+ENV PROJECT_NAME=seecoder-paas
+ENV WORK_PATH=/opt/${PROJECT_NAME}
 COPY settings.xml /root/.m2/settings.xml
 COPY . $WORK_PATH
 RUN cd $WORK_PATH && mvn clean package -DskipTests -DfinalName=$PROJECT_NAME
 
-FROM openjdk:8-jre-alpine
-ENV PROJECT_NAME seecoder-paas
-ENV WORK_PATH /opt/$PROJECT_NAME
+FROM eclipse-temurin:8-jre-alpine
+ENV PROJECT_NAME=seecoder-paas
+ENV WORK_PATH=/opt/${PROJECT_NAME}
 # RUN apk add --no-cache git
 WORKDIR /app
 COPY --from=compile_stage $WORK_PATH/target/${PROJECT_NAME}.jar .
-CMD ["sh", "-c", "java -Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=n -jar -server /app/${PROJECT_NAME}.jar"]
+CMD ["java", "-server", "-Xdebug", "-Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=n", "-jar", "/app/seecoder-paas.jar"]