Skip to content
Snippets Groups Projects
Commit 3cdbc760 authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Merge branch 'malowe/main/159' into 'main'

Iss #159 - Update Jenkinsfile + staging k8s for new latest-staging tag

Closes #159

See merge request !178
parents 1eb4cff9 6a371731
No related branches found
No related tags found
1 merge request!178Iss #159 - Update Jenkinsfile + staging k8s for new latest-staging tag
Pipeline #41366 passed
......@@ -105,6 +105,16 @@
""",
returnStdout: true
)
LATEST_TAG_NAME = sh(
script: """
if [ "${env.ENVIRONMENT}" = "staging" ]; then
printf latest-staging
else
printf latest
fi
""",
returnStdout: true
)
}
options {
......@@ -166,7 +176,7 @@
unstash 'target'
sh 'docker build -f src/main/docker/Dockerfile.jvm --no-cache -t ${IMAGE_NAME}:${TAG_NAME} -t ${IMAGE_NAME}:latest .'
sh 'docker build -f src/main/docker/Dockerfile.jvm --no-cache -t ${IMAGE_NAME}:${TAG_NAME} -t ${IMAGE_NAME}:${LATEST_TAG_NAME} .'
}
}
......@@ -184,7 +194,7 @@
withDockerRegistry([credentialsId: '04264967-fea0-40c2-bf60-09af5aeba60f', url: 'https://index.docker.io/v1/']) {
sh '''
docker push ${IMAGE_NAME}:${TAG_NAME}
docker push ${IMAGE_NAME}:latest
docker push ${IMAGE_NAME}:${LATEST_TAG_NAME}
'''
}
}
......
......@@ -39,7 +39,7 @@ spec:
cpu: '1'
memory: 512Mi
requests:
cpu: 200m
cpu: 300m
memory: 512Mi
env:
- name: CONFIG_SECRET_PATH
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment