From b2d45088ad465604c5b2cf9c2dbc8308c4f6a156 Mon Sep 17 00:00:00 2001
From: Jackson Veroneze <jackson@jacksonveroneze.com>
Date: Wed, 26 Apr 2023 14:45:02 -0300
Subject: [PATCH] feat: ajustes

---
 .github/workflows/pipeline-create-release.yml | 35 +++++++------------
 Aspnet/Base/create-tag.sh                     | 10 ++++++
 Aspnet/Base/push.sh                           | 10 ++++++
 Aspnet/X-Ray/create-tag.sh                    | 10 ++++++
 Aspnet/X-Ray/push.sh                          | 10 ++++++
 5 files changed, 52 insertions(+), 23 deletions(-)
 create mode 100755 Aspnet/Base/create-tag.sh
 create mode 100755 Aspnet/Base/push.sh
 create mode 100755 Aspnet/X-Ray/create-tag.sh
 create mode 100755 Aspnet/X-Ray/push.sh

diff --git a/.github/workflows/pipeline-create-release.yml b/.github/workflows/pipeline-create-release.yml
index 785e29c..afe16b1 100644
--- a/.github/workflows/pipeline-create-release.yml
+++ b/.github/workflows/pipeline-create-release.yml
@@ -9,6 +9,7 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
   DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+  RELEASE: ${{ github.event.release.tag_name }}
 
 jobs:
   generate-publish-docker:
@@ -24,30 +25,18 @@ jobs:
         run: |
           echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
-      - name: Build base images
-        run: cd Aspnet/Base && ./build.sh
-        shell: bash
-
-      - name: Push base images
+      - name: Base - Build and Push
         run: |
-          docker tag jacksonveroneze/aspnet:7.0-alpine jacksonveroneze/aspnet:7.0-alpine-${{ github.event.release.tag_name }}
-          docker tag jacksonveroneze/aspnet:7.0-ubuntu jacksonveroneze/aspnet:7.0-ubuntu-${{ github.event.release.tag_name }}
-          docker tag jacksonveroneze/aspnet:7.0-debian jacksonveroneze/aspnet:7.0-debian-${{ github.event.release.tag_name }}
-          
-          docker push jacksonveroneze/aspnet:7.0-alpine-${{ github.event.release.tag_name }}          
-          docker push jacksonveroneze/aspnet:7.0-ubuntu-${{ github.event.release.tag_name }}
-          docker push jacksonveroneze/aspnet:7.0-debian-${{ github.event.release.tag_name }}
-
-      - name: Build xray images
-        run: cd Aspnet/X-Ray && ./build.sh
+          cd Aspnet/Base
+          ./build.sh
+          ./create-tag.sh
+          ./push.sh
         shell: bash
 
-      - name: Push xray images
+      - name: X-Ray - Build and Push
         run: |
-          docker tag jacksonveroneze/aspnet:7.0-alpine-xray jacksonveroneze/aspnet:7.0-alpine-xray-${{ github.event.release.tag_name }}
-          docker tag jacksonveroneze/aspnet:7.0-ubuntu-xray jacksonveroneze/aspnet:7.0-ubuntu-xray-${{ github.event.release.tag_name }}
-          docker tag jacksonveroneze/aspnet:7.0-debian-xray jacksonveroneze/aspnet:7.0-debian-xray-${{ github.event.release.tag_name }}
-          
-          docker push jacksonveroneze/aspnet:7.0-alpine-xray-${{ github.event.release.tag_name }}
-          docker push jacksonveroneze/aspnet:7.0-ubuntu-xray-${{ github.event.release.tag_name }}
-          docker push jacksonveroneze/aspnet:7.0-debian-xray-${{ github.event.release.tag_name }}
\ No newline at end of file
+          cd Aspnet/X-Ray
+          ./build.sh
+          ./create-tag.sh
+          ./push.sh
+        shell: bash
\ No newline at end of file
diff --git a/Aspnet/Base/create-tag.sh b/Aspnet/Base/create-tag.sh
new file mode 100755
index 0000000..af9fbf0
--- /dev/null
+++ b/Aspnet/Base/create-tag.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#Alpine
+docker tag jacksonveroneze/aspnet:7.0-alpine jacksonveroneze/aspnet:7.0-alpine-$RELEASE
+
+#Ubuntu
+docker tag jacksonveroneze/aspnet:7.0-ubuntu jacksonveroneze/aspnet:7.0-ubuntu-$RELEASE
+
+#Debian
+docker tag jacksonveroneze/aspnet:7.0-debian jacksonveroneze/aspnet:7.0-debian-$RELEASE
\ No newline at end of file
diff --git a/Aspnet/Base/push.sh b/Aspnet/Base/push.sh
new file mode 100755
index 0000000..c8d9934
--- /dev/null
+++ b/Aspnet/Base/push.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#Alpine
+docker push jacksonveroneze/aspnet:7.0-alpine-$RELEASE
+
+#Ubuntu
+docker push jacksonveroneze/aspnet:7.0-ubuntu-$RELEASE
+
+#Debian
+docker push jacksonveroneze/aspnet:7.0-debian-$RELEASE
\ No newline at end of file
diff --git a/Aspnet/X-Ray/create-tag.sh b/Aspnet/X-Ray/create-tag.sh
new file mode 100755
index 0000000..5674abd
--- /dev/null
+++ b/Aspnet/X-Ray/create-tag.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#Alpine
+docker tag jacksonveroneze/aspnet:7.0-alpine jacksonveroneze/aspnet:7.0-alpine-xray-$RELEASE
+
+#Ubuntu
+docker tag jacksonveroneze/aspnet:7.0-ubuntu jacksonveroneze/aspnet:7.0-ubuntu-xray-$RELEASE
+
+#Debian
+docker tag jacksonveroneze/aspnet:7.0-debian jacksonveroneze/aspnet:7.0-debian-xray-$RELEASE
\ No newline at end of file
diff --git a/Aspnet/X-Ray/push.sh b/Aspnet/X-Ray/push.sh
new file mode 100755
index 0000000..d5c2ff3
--- /dev/null
+++ b/Aspnet/X-Ray/push.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+#Alpine
+docker push jacksonveroneze/aspnet:7.0-alpine-xray-$RELEASE
+
+#Ubuntu
+docker push jacksonveroneze/aspnet:7.0-ubuntu-xray-$RELEASE
+
+#Debian
+docker push jacksonveroneze/aspnet:7.0-debian-xray-$RELEASE
\ No newline at end of file