Compare commits

..

No commits in common. "b17a2f72b74d9844c24994aa8f78ca925fec3c16" and "9abce3577d994aba02824aa58b5616246217d13a" have entirely different histories.

3 changed files with 14 additions and 30 deletions

View File

@ -1,6 +1,4 @@
FROM openjdk:11-jre-slim
ARG JAR_FILE=target/*.jar
COPY ${JAR_FILE} app.jar
ENV SPRING_PROFILES_ACTIVE=docker
EXPOSE 9098
ENTRYPOINT ["java","-jar","/app.jar"]
ENTRYPOINT ["java","-jar","/app/jar"]

38
Jenkinsfile vendored
View File

@ -1,11 +1,7 @@
def POD_LABEL="servicedemo-${UUID.randomUUID().toString()}"
def REGISTRY="docker.home.thejimnicholson.com/servicedemo"
def POM_VERSION="unknown"
def MVN_OPTS="-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
def label = "servicedemo-${UUID.randomUUID().toString()}"
podTemplate(label: POD_LABEL, containers: [
podTemplate(label: label, containers: [
containerTemplate(
name: 'maven',
image: 'maven:3.8.4-openjdk-17',
@ -16,13 +12,12 @@ podTemplate(label: POD_LABEL, containers: [
name: 'kaniko',
image: 'gcr.io/kaniko-project/executor:debug',
command: 'sleep',
args: '30d'
args: '99d'
)
], workspaceVolume: dynamicPVC()) {
node(POD_LABEL) {
node(label) {
stage('Checkout') {
checkout scm
sh "git fetch"
GIT_HASH = sh (
script: 'git rev-parse --short HEAD',
returnStdout: true
@ -31,21 +26,14 @@ podTemplate(label: POD_LABEL, containers: [
script: 'git describe --tags --always --dirty=-dirty',
returnStdout: true
).trim()
container('maven') {
stage('Prep') {
sh """
mvn org.apache.maven.plugins:maven-dependency-plugin:2.8:get -Dartifact=fr.brouillard.oss:jgitver:0.14.0:jar:executable ${MVN_OPTS}
"""
}
stage('Build') {
sh """
sh '''
mvn clean package -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
"""
POM_VERSION=sh (
script: "java -jar /root/.m2/repository/fr/brouillard/oss/jgitver/0.14.0/jgitver-0.14.0-executable.jar",
returnStdout: true
)
'''
}
stage('Archive') {
archiveArtifacts artifacts: 'target/*.jar', followSymlinks: false
}
}
container('kaniko') {
@ -56,16 +44,14 @@ podTemplate(label: POD_LABEL, containers: [
-c `pwd` \
--insecure \
--skip-tls-verify \
--tarPath ./target/servicedemo-${POM_VERSION}.image.tar \
--destination=${REGISTRY}/servicedemo:${POM_VERSION} \
--destination=${REGISTRY}/servicedemo:${GIT_HASH} \
--destination=${REGISTRY}/servicedemo:latest"
--no-push \
--tarPath ./target/servicedemo.image.tar \
--destination=servicedemo:${GIT_HASH}"
}
}
stage('Archive') {
archiveArtifacts artifacts: 'target/*.tar', followSymlinks: false
archiveArtifacts artifacts: 'target/*.jar', followSymlinks: false
}
}
}

View File

@ -2,7 +2,7 @@ version: '3'
services:
student-service:
container_name: servicedemo
image: docker.home.thejimnicholson.com/servicedemo/servicedemo:latest
image: servicedemo:latest
ports:
- "9098:9098"
environment: