From 3aa7df5f24e67337d9529ad9c9e81d560bf7b329 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 18 Feb 2025 10:15:13 +0800
Subject: [PATCH] 构建及删除脚本修改
---
rmi_his_image.sh | 6 ++++--
docker-compose.yml | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 48bedc8..94d9df4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.1'
services:
piloth5:
- image: pilot-h5:$BUILD_NUMBER
+ image: drone:pilot-h5-SNAPSHOT-$BUILD_NUMBER
container_name: pilot-h5
ports:
- "8310:80"
diff --git a/rmi_his_image.sh b/rmi_his_image.sh
index fb9c3b1..ed05e16 100644
--- a/rmi_his_image.sh
+++ b/rmi_his_image.sh
@@ -1,5 +1,7 @@
#!/bin/bash
# 删除历史版本镜像
+# 镜像仓库名称
+RESP_NAME=drone
# 打印本次更新的版本号（为jenkins更新的版本号），小于这个版本号的都清理掉
echo $BUILD_NUMBER
# 需要清理的镜像名名称，一般是项目模块名称
@@ -7,12 +9,12 @@
# 要比较的版本号（仅比较数字部分，忽略 -SNAPSHOT）
TARGET_BUILD_NUMBER=$BUILD_NUMBER
# 列出所有相关镜像
-images=$(docker images --filter=reference="$IMAGE_NAME:*" --format '{{.Repository}}:{{.Tag}}')
+images=$(docker images --filter=reference="$RESP_NAME:$IMAGE_NAME-SNAPSHOT-*" --format '{{.Repository}}:{{.Tag}}')
echo $images
for image in $images; do
# 提取镜像标签中的构建号
tag=$(echo $image | cut -d: -f2)
- build_number=$(echo $tag | sed -n 's/.*\([0-9]*\).*/\1/p')
+ build_number=$(echo $tag | sed -n 's/.*-SNAPSHOT-\([0-9]*\).*/\1/p')
# 检查是否提取到有效的构建号
if [[ -z $build_number ]]; then
--
Gitblit v1.9.3