Commit cf747329 authored by xujian's avatar xujian

修改

parent 4f7a6a54
FROM openjdk:8-jdk-alpine3.8 FROM livingobjects/jre8:latest
#设置时区 #设置时区
ARG FILE_NAME="default" ARG FILE_NAME="default"
......
FROM openjdk:8-jdk-alpine3.8
#设置时区
ARG FILE_NAME="default"
ENV PARAMS=""
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
COPY ${FILE_NAME} /app.jar
ENTRYPOINT ["/bin/sh","-c","java -Dfile.encoding=utf8 -Djava.security.egd=file:/dev/.urandom -jar app.jar ${PARAMS}" ]
...@@ -141,9 +141,11 @@ pipeline { ...@@ -141,9 +141,11 @@ pipeline {
if (module.isUpdate && !module.isEncryption) { if (module.isUpdate && !module.isEncryption) {
sh "cd ${module.dir}/${module.path} && mvn -Dmaven.test.failure.ignore=true -s /var/lib/jenkins/settings-itimQR.xml clean package install" sh "cd ${module.dir}/${module.path} && mvn -Dmaven.test.failure.ignore=true -s /var/lib/jenkins/settings-itimQR.xml clean package install"
if(module.name == 'qrcode-modules-data-sharing'){ if(module.name == 'qrcode-modules-data-sharing'){
sh "docker build -f Docker/mysqldump/Dockerfile -t ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}" sh "docker build -f Docker/mysqldump/Dockerfile -t ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}"
} else if(module.name == 'qrcode-modules-product-relation-pcb') {
sh "docker build -f Docker/relation/Dockerfile -t ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}"
} else { } else {
sh "docker build -f Docker/noencryption/Dockerfile -t ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}" sh "docker build -f Docker/noencryption/Dockerfile -t ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}"
} }
// sh "docker build -f Docker/noencryption/Dockerfile -t ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}" // sh "docker build -f Docker/noencryption/Dockerfile -t ${push_path}/${module.name}:${module.version} --build-arg FILE_NAME=${module.dir}/${module.path}/target/*.jar ${workspace}"
sh "echo Qrcode@2022 | docker login https://192.168.31.201 --username admin --password-stdin" sh "echo Qrcode@2022 | docker login https://192.168.31.201 --username admin --password-stdin"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment