From 1a175787490818a7ce59b7bb5356e654dfa89f6b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 28 Mar 2025 19:02:27 +0800
Subject: [PATCH] 修改打包配置
---
rmi_his_image.sh | 4 ++--
docker-compose-test.yml | 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/docker-compose-test.yml b/docker-compose-test.yml
index d214f56..3e60fa7 100644
--- a/docker-compose-test.yml
+++ b/docker-compose-test.yml
@@ -1,7 +1,15 @@
version: '3.1'
services:
piloth5:
- image: drone:pilot-h5-SNAPSHOT-$BUILD_NUMBER
+ image: 172.21.81.239:7666/drone-web-test/pilot-h5:SNAPSHOT-$BUILD_NUMBER
container_name: pilot-h5
ports:
- "8710:80"
+ # 指定network
+ networks:
+ - drone_web_h5_network
+
+# 指定
+networks:
+ drone_web_h5_network:
+ external: true
diff --git a/rmi_his_image.sh b/rmi_his_image.sh
index ed05e16..47ea1e1 100644
--- a/rmi_his_image.sh
+++ b/rmi_his_image.sh
@@ -9,12 +9,12 @@
# 要比较的版本号(仅比较数字部分,忽略 -SNAPSHOT)
TARGET_BUILD_NUMBER=$BUILD_NUMBER
# 列出所有相关镜像
-images=$(docker images --filter=reference="$RESP_NAME:$IMAGE_NAME-SNAPSHOT-*" --format '{{.Repository}}:{{.Tag}}')
+images=$(docker images --filter=reference="$RESP_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/.*-SNAPSHOT-\([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