Use shadowJar gradle task in docker action script, correct name for j…

…ar in Dockerfile
pflooky · Nov 28, 2023 · 9b00aaf · 9b00aaf
1 parent 7dee4da
commit 9b00aaf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ COPY --chown=app:app app/src/main/resources/log4j2.properties /opt/app/log4j2.pr
 COPY --chown=app:app app/src/main/resources/report /opt/app/report
 
 ARG APP_VERSION=0.1
-COPY --chown=app:app app/build/libs/datacaterer-basic-${APP_VERSION}.jar /opt/app/job.jar
+COPY --chown=app:app app/build/libs/app-${APP_VERSION}-all.jar /opt/app/job.jar
 COPY --chown=app:app api/build/libs/datacaterer-api-${APP_VERSION}.jar /opt/spark/jars/datacaterer-api-${APP_VERSION}.jar
 RUN chmod 755 -R /opt/app
 

diff --git a/docker-action.sh b/docker-action.sh
@@ -13,7 +13,7 @@ if [[ "$publish_res" -ne 0 ]] ; then
 fi
 
 echo "Creating data caterer jar, version=$version"
-./gradlew -PapplicationType=basic build basicJar -x shadowJar
+./gradlew build shadowJar
 build_app=$?
 if [[ "$build_app" -ne 0 ]] ; then
   echo "Failed to build app, exiting"