From 5cbf2314348f0ed8d8be39b764c96c5506e86f05 Mon Sep 17 00:00:00 2001
From: clay <odliken@163.com>
Date: Mon, 7 Apr 2025 20:01:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E5=99=A8runner?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E6=90=AD=E5=BB=BA=E5=AE=8C=E6=88=90=20+=20dr?=
 =?UTF-8?q?one=20ci/cd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml |  2 +-
 docker.sh  | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f455d56..a5d7908 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,7 +35,7 @@ steps:
       - sed -i 's/$DRONE_COMMIT/${DRONE_COMMIT}/' deployment.yml
       - sed -i 's/$DRONE_REPO_NAME/${DRONE_REPO_NAME}/' deployment.yml
       - echo $DOCKER_PASSWORD | docker login $REGISTRY --username $DOCKER_USERNAME --password-stdin
-      - sh docker_pro.sh
+      - sh docker.sh.sh
       - docker rmi -f $(docker images | grep $DRONE_REPO_NAME | awk '{print $3}')
 
   - name: deploy
diff --git a/docker.sh b/docker.sh
index 52dfe16..e8ac9c2 100644
--- a/docker.sh
+++ b/docker.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 # 定义应用组名
-group_name='lan'
+group_name='clay'
 # 定义应用名称
 app_name=${DRONE_REPO_NAME}
 # 定义应用版本
 app_version=${DRONE_COMMIT}
 echo ${app_version}
-echo ${app_name}
-docker rm -f ${app_name}
-dockr rmi ${group_name}/${app_name}:${app_version}
 # 打包编译docker镜像
 echo '----build image start----'
-docker build -t ${group_name}/${app_name}:${app_version} .
+docker build -t ${group_name}/${app_name} .
 echo '----build image success----'
-docker run -d -p 8080:8080 --name ${app_name} ${group_name}/${app_name}:${app_version}
-echo 'push success'
+docker tag ${group_name}/${app_name} ${REGISTRY}/${REGISTRY_NAMESPACE}/${app_name}:${app_version}
+docker push ${REGISTRY}/${REGISTRY_NAMESPACE}/${app_name}:${app_version}
+echo 'push success'
\ No newline at end of file