From 9e783991be71a6c8b08960909aa3352ab9256249 Mon Sep 17 00:00:00 2001
From: OrdinaryRoad <1962247851@qq.com>
Date: Sat, 7 Dec 2024 12:58:06 +0800
Subject: [PATCH] cicd

---
 ...d-images.sh => build-and-deploy-images.sh} |  4 +-
 .coding/deploy-docker-coding.sh               | 41 -------------------
 2 files changed, 3 insertions(+), 42 deletions(-)
 rename .coding/{build-images.sh => build-and-deploy-images.sh} (94%)
 delete mode 100644 .coding/deploy-docker-coding.sh

diff --git a/.coding/build-images.sh b/.coding/build-and-deploy-images.sh
similarity index 94%
rename from .coding/build-images.sh
rename to .coding/build-and-deploy-images.sh
index 37e2705..cacc327 100644
--- a/.coding/build-images.sh
+++ b/.coding/build-and-deploy-images.sh
@@ -55,4 +55,6 @@ docker tag ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pu
 docker pull ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-ui
 docker tag ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-ui ordinaryroad-barrage-fly-ui
 
-#docker logout ordinaryroad-docker.pkg.coding.net
\ No newline at end of file
+#docker logout ordinaryroad-docker.pkg.coding.net
+
+echo "deploy finished, please refer to https://ordinaryroad.coding.net/public-artifacts/ordinaryroad-barrage-fly/docker-pub/packages"
\ No newline at end of file
diff --git a/.coding/deploy-docker-coding.sh b/.coding/deploy-docker-coding.sh
deleted file mode 100644
index cc96ba0..0000000
--- a/.coding/deploy-docker-coding.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright 2023 OrdinaryRoad
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-export APP_VERSION=1.5.0
-
-docker login ordinaryroad-docker.pkg.coding.net
-
-# 1 发布后端
-docker tag ordinaryroad-barrage-fly:${APP_VERSION} ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly:${APP_VERSION}
-docker push ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly:${APP_VERSION}
-docker tag ordinaryroad-barrage-fly ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly
-docker push ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly
-
-docker tag ordinaryroad-barrage-fly-arm64:${APP_VERSION} ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-arm64:${APP_VERSION}
-docker push ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-arm64:${APP_VERSION}
-docker tag ordinaryroad-barrage-fly-arm64 ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-arm64
-docker push ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-arm64
-
-# 2 发布前端
-#docker tag ordinaryroad-barrage-fly-ui:${APP_VERSION} ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-ui:${APP_VERSION}
-#docker push ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-ui:${APP_VERSION}
-#docker tag ordinaryroad-barrage-fly-ui ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-ui
-#docker push ordinaryroad-docker.pkg.coding.net/ordinaryroad-barrage-fly/docker-pub/ordinaryroad-barrage-fly-ui
-
-#docker logout ordinaryroad-docker.pkg.coding.net
-
-echo "deploy finished, please refer to https://ordinaryroad.coding.net/public-artifacts/ordinaryroad-barrage-fly/docker-pub/packages"
\ No newline at end of file