Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Docker settings.

Browse Source
This commit is contained in:
Corneil du Plessis
2024-07-10 16:58:30 +02:00
parent 325904532d
commit d6b840c01a
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Jenkinsfile vendored
View File

@@ -25,11 +25,13 @@ pipeline {
steps {
script {
def image = docker.build("${p['docker.java.build.image']}", "ci/")
docker.withRegistry('', "${p['dockerhub.credentials']}") {
image.push()
}
}
docker.withRegistry('', "${p['dockerhub.credentials']}") {
def image = docker.build("${p['docker.java.build.image']}", "ci/")
docker.withRegistry('', "${p['dockerhub.credentials']}") {
image.push()
}
}
}
}
}
stage("Test: baseline (main)") {
@@ -159,7 +161,6 @@ pipeline {
steps {
script {
docker.image("${p['docker.java.build.image-proxy']}").inside(p['docker.java.inside.basic']) {
PROJECT_VERSION = sh(
script: "ci/version.sh",

10
ci/pipeline.properties
View File

@@ -1,16 +1,16 @@
# Java versions
java.legacy.tag=8u362-b09-jdk-focal
java.main.tag=17.0.6_10-jdk-focal
java.main.tag=17.0.11_9-jdk-jammy
java.next.tag=20-jdk-jammy
# Docker container images - standard
docker.java.legacy.image=tae-docker-virtual.usw1.packages.broadcom.com/library/eclipse-temurin:${java.legacy.tag}
docker.java.main.image=tae-docker-virtual.usw1.packages.broadcom.com/library/eclipse-temurin:${java.main.tag}
docker.java.next.image=tae-docker-virtual.usw1.packages.broadcom.com/library/eclipse-temurin:${java.next.tag}
docker.java.legacy.image=library/eclipse-temurin:${java.legacy.tag}
docker.java.main.image=library/eclipse-temurin:${java.main.tag}
docker.java.next.image=library/eclipse-temurin:${java.next.tag}
# Docker container images - for release
docker.java.build.image=springci/spring-ws-eclipse-temurin-with-gpg:${java.main.tag}
docker.java.build.image-proxy=tae-docker-virtual.usw1.packages.broadcom.com/${docker.java.build.image}
docker.java.build.image-proxy=${docker.java.build.image}
# Docker environment settings
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home