new: rework docker image build

Author: ludomikula

deploy/docker/Dockerfile

@@ -37,9 +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/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/lowcoder-server/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/lowcoder-server/target/lowcoder-api-service-bin/libs /lowcoder/api-service/libs
+COPY --chown=lowcoder:lowcoder --from=build-api-service /lowcoder-server/lowcoder-server/target/lowcoder-api-service-bin/plugins /lowcoder/api-service/plugins
 
 EXPOSE 8080
 CMD [ "/bin/bash" , "/lowcoder/api-service/entrypoint.sh" ]

deploy/docker/api-service/entrypoint.sh

@@ -36,5 +36,6 @@ exec gosu ${USER_ID}:${GROUP_ID} ${JAVA_HOME}/bin/java \
   -Dspring.config.location="file:///lowcoder/api-service/config/application.yaml" \
   --add-opens java.base/java.nio=ALL-UNNAMED \
   ${JAVA_OPTS} \
+  -Dpf4j.pluginsDir=/lowcoder/api-service/plugins \
   -jar ${APP_JAR} --spring.webflux.base-path=${CONTEXT_PATH} ${CUSTOM_APP_PROPERTIES}
 

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>
+		<jar.name>lowcoder-api-service</jar.name>
 		<assembly.lib.directory>${project.build.directory}/app-libs</assembly.lib.directory>
 
 		<skipTests>false</skipTests>
@@ -254,6 +255,7 @@
 	</dependencyManagement>
 
 	<build>
+		<finalName>${jar.name}</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -277,7 +279,6 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.3.0</version>
 				<configuration>
-					<finalName>lowcoder-api-service</finalName>
 					<archive>
 						<manifest>
 							<mainClass>org.lowcoder.api.ServerApplication</mainClass>

server/api-service/lowcoder-server/src/assembly/bin.xml

@@ -7,27 +7,23 @@
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 
+	<files>
+		<!-- Lowcoder api-service main jar file -->
+		<file>
+			<source>${project.build.directory}/${jar.name}.jar</source>
+			<outputDirectory>.</outputDirectory>
+		</file>
+	</files>
+
 	<fileSets>
+		<!-- Lowcoder api-server dependencies -->
         <fileSet>
             <directory>${assembly.lib.directory}</directory>
             <outputDirectory>libs</outputDirectory>
         </fileSet>
 	</fileSets>
 
 	<moduleSets>
-		<!-- Main lowcoder API server application -->
-		<moduleSet>
-			<useAllReactorProjects>true</useAllReactorProjects>
-			<includes>
-				<include>org.lowcoder:lowcoder-server</include>
-			</includes>
-			<binaries>
-				<outputDirectory>.</outputDirectory>
-				<includeDependencies>false</includeDependencies>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>		
-
 		<!-- Lowcoder plugins -->
 		<moduleSet>
 			<useAllReactorProjects>true</useAllReactorProjects>