diff --git a/Jenkinsfile b/Jenkinsfile index 105f324..6b1b791 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,8 @@ pipeline { SSH_CREDENTIALS_ID = 'ssh-true-nas' // ID van de SSH-sleutel in Jenkins TRUENAS_HOST = '192.168.2.31' // IP-adres of hostname van TrueNAS SSH_USER = 'jenkins' // SSH-gebruiker voor TrueNAS - IMAGE_NAME = 'veenm/jobfindr-jvm' // Naam van de Docker-image + IMAGE_REPO = 'veenm' // Naam van de Docker-image + IMAGE_NAME = 'jobfindr-jvm' // Naam van de Docker-image IMAGE_TAG = 'latest' } @@ -35,7 +36,7 @@ pipeline { // Maak een Docker-image gebaseerd op de Dockerfile sh 'ls src/main' sh """ - docker build -t ${IMAGE_NAME}:${IMAGE_TAG} -f src/main/resources/Dockerfile.jvm --platform linux/amd64 . + docker build -t ${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG} -f src/main/resources/Dockerfile.jvm --platform linux/amd64 . """ } } @@ -46,7 +47,7 @@ pipeline { script { // Push de Docker-image naar een Docker Registry sh """ - docker push ${IMAGE_NAME}:${IMAGE_TAG} + docker push ${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG} """ } } @@ -61,8 +62,8 @@ pipeline { ssh -o StrictHostKeyChecking=no ${SSH_USER}@${TRUENAS_HOST} << EOF sudo docker stop ${IMAGE_NAME} || true sudo docker rm ${IMAGE_NAME} || true - sudo docker pull ${IMAGE_NAME}:${IMAGE_TAG} || echo "Local image will be used" - sudo docker run -d --name ${IMAGE_NAME} -p 8080:8080 ${IMAGE_NAME}:${IMAGE_TAG} + sudo docker pull ${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG} || echo "Local image will be used" + sudo docker run -d --name ${IMAGE_NAME} -p 8080:8080 ${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG} EOF """ }