diff --git a/Dockerfile b/Dockerfile index 3bda84f..ac9a575 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,15 @@ -FROM 130.120.3.193/library/alpine-oraclejdk8:slim +FROM reg.int.it2000.com.cn/com.gzzn.library/alpine-oraclejdk8:slim MAINTAINER xiunai78 <154707516@qq.com> - + +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \ +&& apk add -U tzdata \ +&& cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ +&& echo 'Asia/Shanghai' >/etc/timezone + +EXPOSE 8080 + # Add the service itself ARG JAR_FILE ADD ${JAR_FILE} /usr/local/adminapi/myapp.jar -#设置时区 -RUN apk add -U tzdata - -RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ - && echo 'Asia/Shanghai' >/etc/timezone - -EXPOSE 8080 - ENTRYPOINT ["/usr/bin/java", "-jar", "/usr/local/adminapi/myapp.jar"] \ No newline at end of file diff --git a/jenkins/Jenkinsfile b/jenkins/Jenkinsfile index 5d60b5f..8f20eec 100644 --- a/jenkins/Jenkinsfile +++ b/jenkins/Jenkinsfile @@ -10,13 +10,8 @@ pipeline { environment { credentialsId = 'e41b57a4-436a-4617-817c-9e3f25a8a47f' - deployName = 'airport-dev' - deployHost = '130.120.3.231' - mailto = '154707516@qq.com' - dockerProtocol = "http" - dockerRegistry = '130.120.3.193' - containerName="adminapi" - export=92 + dockerProtocol = "https" + dockerRegistry = 'reg.int.it2000.com.cn' GROUP = readMavenPom().getGroupId() ARTIFACTID = readMavenPom().getArtifactId() @@ -48,55 +43,8 @@ pipeline { } } - - stage('deploy') { - steps { - withCredentials([sshUserPrivateKey(credentialsId: "${env.credentialsId}", keyFileVariable: 'kfIdentity', passphraseVariable: 'pVariable', usernameVariable: 'userName')]) { - sshCommand(remote: [ name: "${env.deployName}" ,host: "${env.deployHost}" ,allowAnyHosts: true,user: "${userName}",identityFile: "${kfIdentity}" ] , - command: "docker stop ${env.containerName}",sudo: true ,failOnError: false) - sshCommand(remote: [ name: "${env.deployName}" ,host: "${env.deployHost}" ,allowAnyHosts: true,user: "${userName}",identityFile: "${kfIdentity}" ] , - command: "docker rm ${env.containerName}",sudo: true ,failOnError: false) - sshCommand(remote: [ name: "${env.deployName}" ,host: "${env.deployHost}" ,allowAnyHosts: true,user: "${userName}",identityFile: "${kfIdentity}" ] , - command: "docker rmi ${env.dockerRegistry}/${env.GROUP}/${env.ARTIFACTID}:${env.VERSION}",sudo: true ,failOnError: false) - sshCommand(remote: [ name: "${env.deployName}" ,host: "${env.deployHost}" ,allowAnyHosts: true,user: "${userName}",identityFile: "${kfIdentity}" ] , - command: "docker run -d -p ${env.export}:8080 --name ${env.containerName} ${env.dockerRegistry}/${env.GROUP}/${env.ARTIFACTID}:${env.VERSION}",sudo: true ,failOnError: true) - } - } - } + } - post { - success { - emailext ( - subject: "'${env.JOB_NAME} [${env.BUILD_NUMBER}]' 更新正常", - body: """ - 详情: - SUCCESSFUL: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' - 状态:${env.JOB_NAME} jenkins 更新运行正常 - URL :${env.BUILD_URL} - 项目名称 :${env.JOB_NAME} - 项目更新进度:${env.BUILD_NUMBER} - """, - to: "${env.mailto}", - recipientProviders: [[$class: 'DevelopersRecipientProvider']] - ) - } - - failure { - emailext ( - subject: "'${env.JOB_NAME} [${env.BUILD_NUMBER}]' 更新失败", - body: """ - 详情: - FAILED: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' - 状态:${env.JOB_NAME} jenkins 运行失败 - URL :${env.BUILD_URL} - 项目名称 :${env.JOB_NAME} - 项目更新进度:${env.BUILD_NUMBER} - """, - to: "${env.mailto}", - recipientProviders: [[$class: 'DevelopersRecipientProvider']] - ) - } - } } \ No newline at end of file