Try to clean up this stuff #2

Merged
jim merged 6 commits from versioning into master 2022-12-15 12:56:58 +00:00
2 changed files with 5 additions and 7 deletions

10
Jenkinsfile vendored
View File

@ -1,6 +1,6 @@
def POD_LABEL="servicedemo-${UUID.randomUUID().toString()}"
def REGISTRY="docker.home.thejimnicholson.com/servicedemo"
def REGISTRY="registry.thejimnicholson.com/servicedemo"
def POM_VERSION="unknown"
def MVN_OPTS="-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
@ -8,7 +8,7 @@ def MVN_OPTS="-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4
podTemplate(label: POD_LABEL, containers: [
containerTemplate(
name: 'maven',
image: 'maven:3.8.4-openjdk-11',
image: 'maven:3.8.4-openjdk-17',
command: 'sleep',
args: '30d'
),
@ -56,11 +56,9 @@ podTemplate(label: POD_LABEL, containers: [
-c `pwd` \
--insecure \
--skip-tls-verify \
--no-push \
--tarPath ./target/servicedemo-${POM_VERSION}.image.tar \
--destination=${REGISTRY}/servicedemo:${POM_VERSION} \
--destination=${REGISTRY}/servicedemo:${GIT_HASH} \
--destination=${REGISTRY}/servicedemo:latest"
--destination=servicedemo:${GIT_HASH}"
}
}
stage('Archive') {

View File

@ -14,7 +14,7 @@
<name>servicedemo</name>
<description>Demo project for Spring Boot</description>
<properties>
<java.version>11</java.version>
<java.version>17</java.version>
<spring-cloud.version>2020.0.4</spring-cloud.version>
<spring-boot.build-image.imageName>servicedemo</spring-boot.build-image.imageName>
</properties>