From dc1c9f2175939af0ba6545476932958618ed2074 Mon Sep 17 00:00:00 2001
From: cdryzun <yangzun@treesir.pub>
Date: Thu, 24 Aug 2023 18:42:50 +0800
Subject: [PATCH] feat: update - 2

---
 .gitea/workflows/ci.yaml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index 1f1663c..ace199e 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -23,10 +23,6 @@ jobs:
 
       - name: Deploy
         run: |
-          # # Set Run envlist
-          # export ATTRIBUTES=
-
-
           # Setup CLI config
           ./walrus config setup \
             --server ${{ secrets.CI_WALRUS_SERVER }} \
@@ -34,15 +30,17 @@ jobs:
             --environment dev \
             --token '${{ secrets.CI_WALRUS_TOKEN }}
 
+          # set env
+          export ATTRIBUTES="{ \"git_url\": \"https://git.treesir.pub/demoTest/simple-web-service\", \"git_branch\": \"main\", \"git_auth\": false, \"registry_auth\": true, \"registry_username\": \"yangzun\", \"registry_password\": \"${CI_REGISTRY_PASSWORD}\", \"image\": \"harbor.treesir.pub/yangzun/gitea-simple-web-service:${CI_COMMIT_SHA}\", \"namespace\": \"default\", \"name\": \"gitea-simple-web-service\", \"ports\": [8080] }"
+          
           ./walrus service upgrade gitea-simple-web-service \
               --template '{"name":"deploy-source-code", "version":"v0.0.1"}' \
-              --attributes '{ "git_url": "https://git.treesir.pub/demoTest/simple-web-service", "git_branch": "main", "git_auth": false, "registry_auth": true, "registry_username": "yangzun", "registry_password": "${{ secrets.CI_REGISTRY_PASSWORD }}", "image": "yangzun/simple-web-service:${{ github.sha }}", "namespace": "default", "name": "simple-web-service", "ports": [8080] }'
-              
-          # Build and deploy from source code
+              --attributes "$ATTRIBUTES" \
+          
           ./walrus service create \
             --name gitea-simple-web-service \
             --template '{"name":"deploy-source-code", "version":"v0.0.1"}' \
-            --attributes '{ "git_url": "https://git.treesir.pub/demoTest/simple-web-service", "git_branch": "main", "git_auth": false, "registry_auth": true, "registry_username": "yangzun", "registry_password": "${{ secrets.CI_REGISTRY_PASSWORD }}", "image": "yangzun/simple-web-service:${{ github.sha }}", "namespace": "default", "name": "simple-web-service", "ports": [8080] }' \
+            --attributes "$ATTRIBUTES" \
             -d