diff --git a/Dockerfile b/Dockerfile index 98feae1b2..15130d4ea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /app ARG ARTIFACT_VERSION # Copy the JAR file into the image dynamically using the provided version -COPY target/petclinic-${ARTIFACT_VERSION}.jar app.jar +COPY target/spring-petclinic-${ARTIFACT_VERSION}.jar app.jar # Expose port 80 for the application EXPOSE 80 diff --git a/cicd/jenkins-pipelines/build.groovy b/cicd/jenkins-pipelines/build.groovy index 93e838bbd..fe4f615c9 100644 --- a/cicd/jenkins-pipelines/build.groovy +++ b/cicd/jenkins-pipelines/build.groovy @@ -7,6 +7,7 @@ pipeline { DOCKERHUB_CREDENTIALS = credentials('nalexxgd_docker_pass') DOCKERHUB_USERNAME = "nalexxgd" NEXUS_URL = 'localhost:8081' + JAVA_HOME="/Library/Java/JavaVirtualMachines/applejdk-17.0.9.9.1.jdk//Contents/Home" def ARTIFACT_VERSION = sh(script: "mvn help:evaluate -Dexpression=project.version -q -DforceStdout", returnStdout: true).trim() } @@ -32,7 +33,7 @@ pipeline { stage('Build Docker Image') { steps { script { - sh "docker build --build-arg ARTIFACT_VERSION=${ARTIFACT_VERSION} -t petclinic:${ARTIFACT_VERSION} ." + sh "DOCKER_BUILDKIT=0 docker build --build-arg ARTIFACT_VERSION=${ARTIFACT_VERSION} -t petclinic:${ARTIFACT_VERSION} ." sh "docker tag petclinic:${ARTIFACT_VERSION} ${DOCKERHUB_USERNAME}/petclinic:${ARTIFACT_VERSION}" sh "docker login -u ${DOCKERHUB_USERNAME} -p ${DOCKERHUB_CREDENTIALS}" sh "docker push ${DOCKERHUB_USERNAME}/petclinic:${ARTIFACT_VERSION}"