diff --git a/dsBaseWeb/Dockerfile b/dsBaseWeb/Dockerfile index 41395a22..144d7cc8 100644 --- a/dsBaseWeb/Dockerfile +++ b/dsBaseWeb/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:alpine +FROM swr.cn-north-4.myhuaweicloud.com/ddn-k8s/docker.io/nginx:alpine RUN rm /etc/nginx/conf.d/default.conf RUN rm /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/ diff --git a/dsBuild/src/main/java/Util/PublishUtil.java b/dsBuild/src/main/java/Util/PublishUtil.java index 07f3521e..0164b9d1 100644 --- a/dsBuild/src/main/java/Util/PublishUtil.java +++ b/dsBuild/src/main/java/Util/PublishUtil.java @@ -142,6 +142,10 @@ public class PublishUtil { System.out.println(cmd); ssh.exec(cmd); + //删除所有镜像 + cmd="docker rmi $(docker images -q)"; + ssh.exec(cmd); + //获取最新打包后的镜像ID cmd = "docker images --format \"{{.Repository}} {{.Tag}} {{.ID}} {{.CreatedAt}}\" | grep " + projectName + " | sort -k4,5 -r | head -n1 | awk '{print $3}'"; Kv kv = ssh.exec(cmd); @@ -149,19 +153,16 @@ public class PublishUtil { System.out.println("镜像打包完成,镜像ID=" + imageId); //登录镜像仓库 - //cmd = "docker login --username=东师黄海 --password=DsideaL4r5t6y7u registry.cn-hangzhou.aliyuncs.com"; cmd = "docker login --username=驿来特充电 --password=ylt5033. registry.cn-hangzhou.aliyuncs.com"; System.out.println(cmd); ssh.exec(cmd); System.out.println("仓库登录成功!"); System.out.println("打标签..."); - //cmd = "docker tag " + imageId + " registry.cn-hangzhou.aliyuncs.com/dsideal/" + projectName + ":" + newVersion; cmd = "docker tag " + imageId + " registry.cn-hangzhou.aliyuncs.com/yltcharge/" + projectName + ":" + newVersion; ssh.exec(cmd); System.out.println("开始推送到远程仓库,稍等..."); - //cmd = "docker push registry.cn-hangzhou.aliyuncs.com/dsideal/" + projectName + ":" + newVersion; cmd = "docker push registry.cn-hangzhou.aliyuncs.com/yltcharge/" + projectName + ":" + newVersion; System.out.println(cmd); ssh.exec(cmd);