W-16954625: Fix docker image build

salesforce · Oct 14, 2024 · a2fc4ea · a2fc4ea
1 parent 20de524
commit a2fc4ea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/carbonj.service/Dockerfile b/carbonj.service/Dockerfile
@@ -6,7 +6,7 @@
 #
 
 FROM registry.access.redhat.com/ubi9/ubi:9.4-1214.1726694543
-ARG DEPENDENCY=src/main/docker/files
+ARG DEPENDENCY=build/dependency
 ARG VERSION=latest
 
 # install dependencies
@@ -43,7 +43,9 @@ RUN yum update -y && \
   chmod +x /sbin/tini
 
 # add java code
-COPY build/libs/carbonj.service-${VERSION}.jar /app
+COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
+COPY ${DEPENDENCY}/META-INF /app/META-INF
+COPY ${DEPENDENCY}/BOOT-INF/classes /app
 # add scripts
 COPY ${DEPENDENCY}/entrypoint.sh ${DEPENDENCY}/onOutOfMemoryError.sh ${DEPENDENCY}/logCleanup.sh \
   ${DEPENDENCY}/deletemetrics.py ${DEPENDENCY}/disklog.sh ${DEPENDENCY}/fdlog.sh ${DEPENDENCY}/iolog.sh \

diff --git a/carbonj.service/build.gradle b/carbonj.service/build.gradle
@@ -73,7 +73,6 @@ ext {
     }
 }
 
-
 repositories {
     mavenLocal()
     mavenCentral()
@@ -88,7 +87,13 @@ task unpack(type: Copy) {
     into("build/dependency")
 }
 
+task copyDockerFiles(type: Copy) {
+    from 'src/main/docker/files'
+    into 'build/dependency'
+}
+
 tasks.register('docker', Exec) {
+    dependsOn unpack, copyDockerFiles
     def command = getDockerBuildCmd("${dockerRepo}${project.dockerGroup}:${project.version}", "${project.version}")
     doFirst {
         logger.lifecycle("${command.join(' ')}")

diff --git a/carbonj.service/src/main/docker/files/entrypoint.sh b/carbonj.service/src/main/docker/files/entrypoint.sh
@@ -159,5 +159,5 @@ fi
 
 cd /app
 exec java $JAVA_OPTS $YOURKIT_PROFILER_OPTS $JAVA_OPTS_OVERRIDE --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED \
---add-opens java.base/java.util=ALL-UNNAMED -Dlogback.debug=true -cp /app -jar /app/carbonj.service-*.jar \
+--add-opens java.base/java.util=ALL-UNNAMED -Dlogback.debug=true -cp /app:/app/lib/* com.demandware.carbonj.service.engine.CarbonJServiceMain \
 --spring.config.location=$CONFIG_LOCATIONS