diff --git a/Dockerfile b/Dockerfile index a3685948..e2ac22eb 100644 --- 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 index d1e7fa02..017edf82 100644 --- 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"