From 73243a8f57e7daeb0df2947f73b9e9e3c90ed1c6 Mon Sep 17 00:00:00 2001
From: xRain <xrain@simcu.com>
Date: Tue, 22 Aug 2023 14:40:17 +0800
Subject: [PATCH] test

---
 action.yml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/action.yml b/action.yml
index cd3ae16..94d9cde 100644
--- a/action.yml
+++ b/action.yml
@@ -4,6 +4,11 @@ description: 'build docker image and push to simcu code'
 runs:
   using: 'composite'
   steps:
+  - name: build .net app
+    uses: docker://mcr.microsoft.com/dotnet/sdk:7.0
+    with:
+      args: dotnet publish -r linux-x64 -c Release --self-contained -o dist -p:AssemblyName=App
+
   - name: create dockerfile
     uses: docker://ubuntu:latest
     with:
@@ -16,20 +21,15 @@ runs:
          echo "已经构建完DOCKERFILE了" && \
          cat Dockerfile'
 
-  # - name: build .net app
-  #   uses: docker://mcr.microsoft.com/dotnet/sdk:7.0
-  #   with:
-  #     args: dotnet publish -r linux-x64 -c Release --self-contained -o dist -p:AssemblyName=App
-
   - name: build docker image
     uses: docker://docker:git
+    env:
+      DOCKER_IMAGE: ${{env.DOCKER_REGISTRY}}/${{github.repository}}:${{ github.ref_name }}
     with:
       entrypoint: "/bin/sh"
       args: |
-        -c "echo 这是一个测试信息"
-        -c 'docker build -t ${{env.DOCKER_REGISTRY}}/${{github.repository}}:${{ github.ref_name }}-1 .'
-        -c "echo 已经构建完了"
-        -c 'docker login ${{env.DOCKER_REGISTRY}} -u ${{env.DOCKER_USER}} -p ${{env.DOCKER_PASS}}'
-        -c "echo 登录仓库"
-        -c 'docker push ${{env.DOCKER_REGISTRY}}/${{github.repository}}:${{ github.ref_name }}-1'    
-        -c "echo 成功了" 
\ No newline at end of file
+        -c 'docker build -t ${{env.DOCKER_IMAGE}} . && \
+           echo ${{env.DOCKER_IMAGE}}已经构建完了 && \
+           docker login ${{env.DOCKER_REGISTRY}} -u ${{env.DOCKER_USER}} -p ${{env.DOCKER_PASS}} && \
+           docker push ${{env.DOCKER_IMAGE}} && \
+           echo ${{env.DOCKER_IMAGE}}推送成功'
\ No newline at end of file