fix: fixed dependencies and docker build

ludomikula · ludomikula · commit e10f7349f4cd · 2024-04-18T00:15:25.000+02:00
diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile
@@ -37,11 +37,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends gosu \
 COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder/api-service /lowcoder/api-service
 
 # Copy lowcoder api service app, dependencies and libs
-COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/app /lowcoder/api-service/app
-COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/dependencies /lowcoder/api-service/dependencies
+COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/lowcoder-api-service.jar /lowcoder/api-service/lowcoder-api-service.jar
 COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/libs /lowcoder/api-service/libs
 COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/plugins /lowcoder/api-service/plugins
-COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/distribution/target/lowcoder-api-service-bin/set-classpath.sh /lowcoder/api-service/set-classpath.sh
 
 EXPOSE 8080
 CMD [ "/bin/bash" , "/lowcoder/api-service/entrypoint.sh" ]
diff --git a/deploy/docker/api-service/entrypoint.sh b/deploy/docker/api-service/entrypoint.sh
@@ -12,7 +12,7 @@ echo "Initializing api-service..."
 if [ -z $JAVA_HOME ]; then
     JAVA_HOME=`dirname $(dirname $(readlink -f $(which javac)))`
 fi;
-APP_JAR="${APP_JAR:=/lowcoder/api-service/server.jar}"
+APP_JAR="${APP_JAR:=/lowcoder/api-service/lowcoder-api-service.jar}"
 JAVA_OPTS="${JAVA_OPTS:=}"
 CUSTOM_APP_PROPERTIES="${APP_PROPERTIES}"
 CONTEXT_PATH=${CONTEXT_PATH:=/}
@@ -27,7 +27,6 @@ ${JAVA_HOME}/bin/java -version
 echo
 
 cd /lowcoder/api-service
-source set-classpath.sh
 
 exec gosu ${USER_ID}:${GROUP_ID} ${JAVA_HOME}/bin/java \
   -Djava.util.prefs.userRoot=/tmp \
@@ -36,7 +35,6 @@ exec gosu ${USER_ID}:${GROUP_ID} ${JAVA_HOME}/bin/java \
   -Dlog4j2.formatMsgNoLookups=true \
   -Dspring.config.location="file:///lowcoder/api-service/config/application.yaml" \
   --add-opens java.base/java.nio=ALL-UNNAMED \
-  -cp "${LOWCODER_CLASSPATH:=.}" \
   ${JAVA_OPTS} \
-  org.lowcoder.api.ServerApplication --spring.webflux.base-path=${CONTEXT_PATH} ${CUSTOM_APP_PROPERTIES}
+  -jar ${APP_JAR} --spring.webflux.base-path=${CONTEXT_PATH} ${CUSTOM_APP_PROPERTIES}
 
diff --git a/server/api-service/distribution/pom.xml b/server/api-service/distribution/pom.xml
diff --git a/server/api-service/distribution/src/assembly/set-classpath.sh b/server/api-service/distribution/src/assembly/set-classpath.sh
diff --git a/server/api-service/lowcoder-plugins/clickHousePlugin/pom.xml b/server/api-service/lowcoder-plugins/clickHousePlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>clickHousePlugin</artifactId>
     <packaging>jar</packaging>
 
diff --git a/server/api-service/lowcoder-plugins/elasticSearchPlugin/pom.xml b/server/api-service/lowcoder-plugins/elasticSearchPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>elasticSearchPlugin</artifactId>
 
     <name>elasticSearchPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/googleSheetsPlugin/pom.xml b/server/api-service/lowcoder-plugins/googleSheetsPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>googleSheetsPlugin</artifactId>
 
     <name>googleSheetsPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/lowcoderApiPlugin/pom.xml b/server/api-service/lowcoder-plugins/lowcoderApiPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>lowcoderApiPlugin</artifactId>
 
     <properties>
diff --git a/server/api-service/lowcoder-plugins/mongoPlugin/pom.xml b/server/api-service/lowcoder-plugins/mongoPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>mongoPlugin</artifactId>
 
     <name>mongoPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/mssqlPlugin/pom.xml b/server/api-service/lowcoder-plugins/mssqlPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>mssqlPlugin</artifactId>
 
     <name>mssqlPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/mysqlPlugin/pom.xml b/server/api-service/lowcoder-plugins/mysqlPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>mysqlPlugin</artifactId>
 
     <name>mysqlPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/oraclePlugin/pom.xml b/server/api-service/lowcoder-plugins/oraclePlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>oraclePlugin</artifactId>
 
 
diff --git a/server/api-service/lowcoder-plugins/postgresPlugin/pom.xml b/server/api-service/lowcoder-plugins/postgresPlugin/pom.xml
@@ -10,6 +10,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>postgresPlugin</artifactId>
 
     <name>postgresPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/redisPlugin/pom.xml b/server/api-service/lowcoder-plugins/redisPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>redisPlugin</artifactId>
 
     <name>redisPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/restApiPlugin/pom.xml b/server/api-service/lowcoder-plugins/restApiPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>restApiPlugin</artifactId>
 
     <name>restApiPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/smtpPlugin/pom.xml b/server/api-service/lowcoder-plugins/smtpPlugin/pom.xml
@@ -9,6 +9,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>smtpPlugin</artifactId>
 
     <name>smtpPlugin</name>
diff --git a/server/api-service/lowcoder-plugins/snowflakePlugin/pom.xml b/server/api-service/lowcoder-plugins/snowflakePlugin/pom.xml
@@ -9,6 +9,7 @@
         <version>${revision}</version>
     </parent>
 
+    <groupId>org.lowcoder.plugins</groupId>
     <artifactId>snowflakePlugin</artifactId>
 
     <properties>
diff --git a/server/api-service/lowcoder-server/pom.xml b/server/api-service/lowcoder-server/pom.xml
@@ -17,6 +17,7 @@
 	<properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<assembly.lib.directory>${project.build.directory}/app-libs</assembly.lib.directory>
 
 		<skipTests>false</skipTests>
 		<skipUnitTests>${skipTests}</skipUnitTests>
@@ -44,6 +45,11 @@
 			<groupId>org.lowcoder</groupId>
 			<artifactId>lowcoder-domain</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.lowcoder</groupId>
+			<artifactId>sqlBasedPlugin</artifactId>
+			<version>${revision}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.lowcoder.plugin</groupId>
 			<artifactId>lowcoder-plugin-api</artifactId>
@@ -249,14 +255,34 @@
 
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${assembly.lib.directory}</outputDirectory>
+							<includeScope>runtime</includeScope>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.3.0</version>
 				<configuration>
+					<finalName>lowcoder-api-service</finalName>
 					<archive>
 						<manifest>
 							<mainClass>org.lowcoder.api.ServerApplication</mainClass>
+							<classpathPrefix>libs/</classpathPrefix>
+							<addClasspath>true</addClasspath>
 							<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
 							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
 							<addBuildEnvironmentEntries>true</addBuildEnvironmentEntries>
@@ -290,7 +316,6 @@
 					<keypass>${keystore.key.password}</keypass>
 				</configuration>
 			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -357,6 +382,24 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>distro-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<attach>false</attach>
+							<descriptors>
+								<descriptor>src/assembly/bin.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/server/api-service/lowcoder-server/src/assembly/bin.xml b/server/api-service/lowcoder-server/src/assembly/bin.xml
@@ -7,19 +7,10 @@
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 
-	<files>
-		<file>
-			<source>src/assembly/set-classpath.sh</source>
-			<outputDirectory></outputDirectory>
-		</file>
-	</files>
 	<fileSets>
         <fileSet>
             <directory>${assembly.lib.directory}</directory>
-            <outputDirectory>dependencies</outputDirectory>
-			<excludes>
-				<exclude>${project.groupId}:*</exclude>
-			</excludes>
+            <outputDirectory>libs</outputDirectory>
         </fileSet>
 	</fileSets>
 
@@ -31,43 +22,24 @@
 				<include>org.lowcoder:lowcoder-server</include>
 			</includes>
 			<binaries>
-				<outputDirectory>app</outputDirectory>
+				<outputDirectory>.</outputDirectory>
 				<includeDependencies>false</includeDependencies>
 				<unpack>false</unpack>
 			</binaries>
 		</moduleSet>		
 
-		<!-- Lowcoder API server dependencies -->
-		<moduleSet>
-			<useAllReactorProjects>true</useAllReactorProjects>
-			<includes>
-				<include>org.lowcoder:lowcoder-domain</include>
-				<include>org.lowcoder:lowcoder-infra</include>
-				<include>org.lowcoder:lowcoder-sdk</include>
-				<include>org.lowcoder:sqlBasedPlugin</include>
-			</includes>
-			<binaries>
-				<outputDirectory>libs</outputDirectory>
-				<includeDependencies>false</includeDependencies>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>
-
-		<!-- Lowcoder plugins -->		
+		<!-- Lowcoder plugins -->
 		<moduleSet>
 			<useAllReactorProjects>true</useAllReactorProjects>
 			<includeSubModules>true</includeSubModules>
 			<includes>
-				<include>org.lowcoder:*Plugin</include>
+				<include>org.lowcoder.plugins:*Plugin</include>
 			</includes>
-			<excludes>
-				<exclude>org.lowcoder:sqlBasedPlugin</exclude>
-			</excludes>
 			<binaries>
 				<outputDirectory>plugins</outputDirectory>
 				<includeDependencies>false</includeDependencies>
 				<unpack>false</unpack>
 			</binaries>
-		</moduleSet>		
+		</moduleSet>
 	</moduleSets>
 </assembly>
diff --git a/server/api-service/lowcoder-server/src/main/resources/application-debug.yaml b/server/api-service/lowcoder-server/src/main/resources/application-debug.yaml
diff --git a/server/api-service/lowcoder-server/src/main/resources/application.yaml b/server/api-service/lowcoder-server/src/main/resources/application.yaml
diff --git a/server/api-service/pom.xml b/server/api-service/pom.xml
