1
0
Просмотр исходного кода

Merge branch 'internal-paas' of http://gogs.seec.seecoder.cn/FanYanPeng/SEEC-Gitlab into internal-paas

BiYuChen 2 лет назад
Родитель
Сommit
1ad7c3f267
3 измененных файлов с 23 добавлено и 8 удалено
  1. 21 6
      Dockerfile
  2. 1 1
      pom.xml
  3. 1 1
      seecoder-gitlab-server/pom.xml

+ 21 - 6
Dockerfile

@@ -1,13 +1,28 @@
+# todo: dockerfile 考虑自动生成
+
 FROM maven:3.6.1 AS compile_stage
+
 ENV PROJECT_NAME app
+# 项目所在的工作目录
 ENV WORK_PATH /opt/$PROJECT_NAME
-COPY settings.xml /root/.m2/settings.xml
-COPY . $WORK_PATH
-RUN cd $WORK_PATH && mvn clean install -DskipTests -DfinalName=$PROJECT_NAME
 
-FROM openjdk:8-jre-alpine
+# 跳转到工作目录
+WORKDIR $WORK_PATH
+
+COPY . .
+
+ADD settings.xml /root/.m2/settings.xml
+
+# 使用缓存进行构建
+RUN --mount=type=cache,target=/root/.m2 \
+  mvn clean install -DskipTests -DfinalName=$PROJECT_NAME
+
+FROM adoptopenjdk/openjdk8
+
 ENV PROJECT_NAME app
 ENV WORK_PATH /opt/$PROJECT_NAME
+ENV MODELE_NAME seecoder-gitlab-server
+
 WORKDIR /app
-COPY --from=compile_stage $WORK_PATH/seecoder-gitlab-server/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"]
+COPY --from=compile_stage $WORK_PATH/$MODELE_NAME/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"]

+ 1 - 1
pom.xml

@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.gitlab4j</groupId>
                 <artifactId>gitlab4j-api</artifactId>
-                <version>5.0.0</version>
+                <version>5.3.0</version>
             </dependency>
             <dependency>
                 <groupId>mysql</groupId>

+ 1 - 1
seecoder-gitlab-server/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.gitlab4j</groupId>
             <artifactId>gitlab4j-api</artifactId>
-            <version>5.0.0</version>
+            <version>5.3.0</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>