Skip to content

Commit cce5564

Browse files
committed
Reintroduce Docker containers for release.
Releasing requires additional tools inside the container that does the releasing process, whether to maven central or artifactory. Resolves #1353.
1 parent aceefff commit cce5564

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

Jenkinsfile

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ pipeline {
1717
}
1818

1919
stages {
20+
stage('Publish Eclipse Temurin (main) + gpg docker image') {
21+
when {
22+
changeset "ci/Dockerfile"
23+
}
24+
agent any
25+
26+
steps {
27+
script {
28+
def image = docker.build("${p['docker.java.build.image']}", "ci/")
29+
docker.withRegistry('', "${p['dockerhub.credentials']}") {
30+
image.push()
31+
}
32+
}
33+
}
34+
}
2035
stage("Test: baseline (main)") {
2136
agent any
2237
options { timeout(time: 30, unit: 'MINUTES')}
@@ -85,7 +100,7 @@ pipeline {
85100

86101
steps {
87102
script {
88-
docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.basic']) {
103+
docker.image("${p['docker.java.build.image-proxy']}").inside(p['docker.java.inside.basic']) {
89104
PROJECT_VERSION = sh(
90105
script: "ci/version.sh",
91106
returnStdout: true

ci/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM eclipse-temurin:17.0.6_10-jdk-focal
2+
3+
RUN apt-get update && apt-get install -y gpg
4+
5+
RUN apt-get clean \
6+
&& rm -rf /var/lib/apt/lists/*

ci/pipeline.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,13 @@ java.next.tag=20-jdk-jammy
66
docker.java.main.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.main.tag}
77
docker.java.next.image=harbor-repo.vmware.com/dockerhub-proxy-cache/library/eclipse-temurin:${java.next.tag}
88

9+
# Docker container images - for release
10+
docker.java.build.image=springci/spring-ws-eclipse-temurin-with-gpg:${java.main.tag}
11+
docker.java.build.image-proxy=harbor-repo.vmware.com/dockerhub-proxy-cache/${docker.java.build.image}
12+
913
# Docker environment settings
1014
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
1115

1216
# Credentials
1317
artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
18+
dockerhub.credentials=hub.docker.com-springbuildmaster

0 commit comments

Comments
 (0)