From 8d6885e65d92283bd0ed7c5f04046bf91661401e Mon Sep 17 00:00:00 2001
From: MattWay224 <win220404@mail.ru>
Date: Tue, 27 May 2025 10:57:35 +0300
Subject: [PATCH 1/4] ci added

---
 .github/workflows/ci.yaml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .github/workflows/ci.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 0000000..12b5018
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,27 @@
+name: CI/CD Pipeline
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push Docker image
+        run: |
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/myapp:${{ github.sha }} .
+          docker push ${{ secrets.DOCKER_USERNAME }}/myapp:${{ github.sha }}

From e7f7b5fcce42a2d6ad4aa79cd23ea4d3cad81702 Mon Sep 17 00:00:00 2001
From: MattWay224 <win220404@mail.ru>
Date: Tue, 27 May 2025 11:00:22 +0300
Subject: [PATCH 2/4] ci on pr

---
 .github/workflows/ci.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 12b5018..a2ef5dd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   deploy:

From 1eae060b96cdebb79a9bb604217727b195a83f5d Mon Sep 17 00:00:00 2001
From: MattWay224 <win220404@mail.ru>
Date: Tue, 27 May 2025 11:01:38 +0300
Subject: [PATCH 3/4] ci fix

---
 .github/workflows/ci.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a2ef5dd..c98527f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -26,5 +26,5 @@ jobs:
 
       - name: Build and push Docker image
         run: |
-          docker build -t ${{ secrets.DOCKER_USERNAME }}/myapp:${{ github.sha }} .
-          docker push ${{ secrets.DOCKER_USERNAME }}/myapp:${{ github.sha }}
+          docker build -t ${{ secrets.DOCKER_USERNAME }}/linshor .
+          docker push ${{ secrets.DOCKER_USERNAME }}/linshor

From 78d8f9abab43d1c6b3cfa462db6aa6060dd018c5 Mon Sep 17 00:00:00 2001
From: MattWay224 <win220404@mail.ru>
Date: Tue, 27 May 2025 11:07:04 +0300
Subject: [PATCH 4/4] ci fix

---
 .github/workflows/ci.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c98527f..3a273dc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,6 +25,9 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push Docker image
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         run: |
-          docker build -t ${{ secrets.DOCKER_USERNAME }}/linshor .
-          docker push ${{ secrets.DOCKER_USERNAME }}/linshor
+          echo "Using Docker tag: $DOCKER_USERNAME/linshor:${{ github.sha }}"
+          docker build -t $DOCKER_USERNAME/linshor:${{ github.sha }} .
+          docker push $DOCKER_USERNAME/linshor:${{ github.sha }}