From f392157da65faaa9d65f41d241161651842b350a Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 13:20:05 +0300
Subject: [PATCH 01/36] Update main.yaml

Adding caching for npm to enhance the pipeline's durability.
---
 .github/workflows/main.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index b6af09e7b..cac14bb46 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -20,6 +20,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
+          cache: 'npm'
 
       - name : Npm Install
         run: npm install

From 11733e5c83fbe9bc5d21c9d132238b24b6860415 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:17:48 +0300
Subject: [PATCH 02/36] Update main.yaml

---
 .github/workflows/main.yaml | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index cac14bb46..857ea5460 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -44,10 +44,23 @@ jobs:
   Test_Docker:
     runs-on: ubuntu-latest
     steps:
-
-      #Checkout Repository
+      # Checkout the repository
       - uses: actions/checkout@v3
-      
+  
+      # Set up Docker Buildx for caching
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+  
+      # Cache Docker layers to speed up subsequent builds
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+  
+      # Build and run Docker Compose with build cache enabled
       - name: Test Docker Compose
         uses: isbang/compose-action@v1.5.1
         with:
@@ -55,4 +68,10 @@ jobs:
           up-flags: "-d --build"
         env:
           password: ${{ secrets.DOCKER_PASS }}
+  
+      # Save Docker layers cache after build
+      - name: Export Docker layers cache
+        run: |
+          docker buildx build --cache-to=type=local,dest=/tmp/.buildx-cache --output=type=local,dest=/tmp/.build-output
+
 

From 9f935c73bc4cf54894d341ad8ed079b3b7d5e3f7 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:21:27 +0300
Subject: [PATCH 03/36] Update main.yaml

---
 .github/workflows/main.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 857ea5460..839d69c99 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -75,3 +75,4 @@ jobs:
           docker buildx build --cache-to=type=local,dest=/tmp/.buildx-cache --output=type=local,dest=/tmp/.build-output
 
 
+

From e200a32d728962c005c7c6af43d92775272b106c Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:29:06 +0300
Subject: [PATCH 04/36] Update main.yaml

---
 .github/workflows/main.yaml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 839d69c99..036a70c0c 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -44,14 +44,15 @@ jobs:
   Test_Docker:
     runs-on: ubuntu-latest
     steps:
-      # Checkout the repository
-      - uses: actions/checkout@v3
-  
-      # Set up Docker Buildx for caching
+      # Checkout
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Set up Buildx
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-  
-      # Cache Docker layers to speed up subsequent builds
+
+      # Use Buildx with caching
       - name: Cache Docker layers
         uses: actions/cache@v3
         with:
@@ -59,20 +60,16 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
-  
-      # Build and run Docker Compose with build cache enabled
+
+      # Build and run with caching
       - name: Test Docker Compose
         uses: isbang/compose-action@v1.5.1
         with:
           compose-file: "./compose.yaml"
-          up-flags: "-d --build"
+          up-flags: "-d --build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache"
         env:
           password: ${{ secrets.DOCKER_PASS }}
-  
-      # Save Docker layers cache after build
-      - name: Export Docker layers cache
-        run: |
-          docker buildx build --cache-to=type=local,dest=/tmp/.buildx-cache --output=type=local,dest=/tmp/.build-output
+          BUILDKIT_INLINE_CACHE: 1  # Enable inline cache
 
 
 

From 24b533198a8e7f1659fef7d63ca9142a00958aa3 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:31:44 +0300
Subject: [PATCH 05/36] Update main.yaml

---
 .github/workflows/main.yaml | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 036a70c0c..61cc1e514 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -44,14 +44,13 @@ jobs:
   Test_Docker:
     runs-on: ubuntu-latest
     steps:
-      # Checkout
       - name: Checkout repository
         uses: actions/checkout@v3
-
+  
       # Set up Buildx
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-
+  
       # Use Buildx with caching
       - name: Cache Docker layers
         uses: actions/cache@v3
@@ -60,16 +59,18 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
-
-      # Build and run with caching
+  
+      # Build with caching
+      - name: Build Docker Compose services
+        run: |
+          docker-compose -f ./compose.yaml build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache
+  
+      # Run Docker Compose
       - name: Test Docker Compose
         uses: isbang/compose-action@v1.5.1
         with:
           compose-file: "./compose.yaml"
-          up-flags: "-d --build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache"
-        env:
-          password: ${{ secrets.DOCKER_PASS }}
-          BUILDKIT_INLINE_CACHE: 1  # Enable inline cache
+          up-flags: "-d"
 
 
 

From da3e9b3e2d6ef96f3537f5dfb55125609c7d61da Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:34:02 +0300
Subject: [PATCH 06/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 61cc1e514..b996f75bb 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -63,7 +63,7 @@ jobs:
       # Build with caching
       - name: Build Docker Compose services
         run: |
-          docker-compose -f ./compose.yaml build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache
+          docker compose -f ./compose.yaml build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache
   
       # Run Docker Compose
       - name: Test Docker Compose

From 876135c9b0fcef03c0e37c7ea6dc4680c2c8b416 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:40:16 +0300
Subject: [PATCH 07/36] Update main.yaml

---
 .github/workflows/main.yaml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index b996f75bb..2eab3a931 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -44,14 +44,12 @@ jobs:
   Test_Docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-  
-      # Set up Buildx
+      - name: Checkout
+        uses: actions/checkout@v2
+        
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-  
-      # Use Buildx with caching
+
       - name: Cache Docker layers
         uses: actions/cache@v3
         with:
@@ -59,18 +57,21 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
-  
-      # Build with caching
-      - name: Build Docker Compose services
+
+      - name: Build and push Docker images
         run: |
-          docker compose -f ./compose.yaml build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from=type=local,src=/tmp/.buildx-cache --cache-to=type=local,dest=/tmp/.buildx-cache
-  
-      # Run Docker Compose
-      - name: Test Docker Compose
-        uses: isbang/compose-action@v1.5.1
+          docker-compose build --parallel
+
+      - name: Cache Docker Compose files
+        uses: actions/cache@v3
         with:
-          compose-file: "./compose.yaml"
-          up-flags: "-d"
+          path: ./path/to/your/compose/files
+          key: ${{ runner.os }}-docker-compose-${{ hashFiles('./compose.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-docker-compose-
+
+      - name: Run Docker Compose
+        run: docker-compose up -d
 
 
 

From c5b2403e4164498151048dcd7603d47f7edf138c Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:41:28 +0300
Subject: [PATCH 08/36] Update main.yaml

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

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 2eab3a931..bd65cb65d 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Build and push Docker images
         run: |
-          docker-compose build --parallel
+          docker compose build --parallel
 
       - name: Cache Docker Compose files
         uses: actions/cache@v3
@@ -71,7 +71,7 @@ jobs:
             ${{ runner.os }}-docker-compose-
 
       - name: Run Docker Compose
-        run: docker-compose up -d
+        run: docker compose up -d
 
 
 

From ad5a9d56cc75ce0841370b8b2e8ec366006ce553 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:56:18 +0300
Subject: [PATCH 09/36] Update main.yaml

---
 .github/workflows/main.yaml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index bd65cb65d..0f2c771c9 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -50,26 +50,10 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
       - name: Build and push Docker images
         run: |
           docker compose build --parallel
 
-      - name: Cache Docker Compose files
-        uses: actions/cache@v3
-        with:
-          path: ./path/to/your/compose/files
-          key: ${{ runner.os }}-docker-compose-${{ hashFiles('./compose.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-docker-compose-
-
       - name: Run Docker Compose
         run: docker compose up -d
 

From 757598b497e941829fad9d68813d3727306e0152 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Fri, 4 Oct 2024 14:59:28 +0300
Subject: [PATCH 10/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 0f2c771c9..ecfe72208 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2

From fa5b135863e98c2428d119e875cc73bde0faa0dd Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 22:43:39 +0300
Subject: [PATCH 11/36] Update main.yaml

adding caching
---
 .github/workflows/main.yaml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index ecfe72208..e452bcf36 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -50,9 +50,17 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Build and push Docker images
-        run: |
-          docker compose build --parallel
+      - name: Build Dockerfile.stage
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          file: ./docker/Dockerfile.stage
+          
+      - name: Build Dockerfile.build
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          file: ./docker/Dockerfile.build
 
       - name: Run Docker Compose
         run: docker compose up -d

From 52792676092bc85cd7a6de3edb5f6fedf2ff8181 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 22:46:49 +0300
Subject: [PATCH 12/36] Update main.yaml

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

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index e452bcf36..3812fcf91 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -55,12 +55,16 @@ jobs:
         with:
           push: false
           file: ./docker/Dockerfile.stage
+          cache-from: type=gha
+          cache-to: type=gha, mode=max
           
       - name: Build Dockerfile.build
         uses: docker/build-push-action@v6
         with:
           push: false
           file: ./docker/Dockerfile.build
+          cache-from: type=gha
+          cache-to: type=gha, mode=max
 
       - name: Run Docker Compose
         run: docker compose up -d

From 7833abe243e4b8222adaab4b04ad5f251270b4e4 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 22:58:03 +0300
Subject: [PATCH 13/36] Create compose-gh-ci.yaml

---
 compose-gh-ci.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 compose-gh-ci.yaml

diff --git a/compose-gh-ci.yaml b/compose-gh-ci.yaml
new file mode 100644
index 000000000..b50b5dee0
--- /dev/null
+++ b/compose-gh-ci.yaml
@@ -0,0 +1,42 @@
+version: "3.8"
+services:
+  builder:
+    container_name: builder
+    # Build frontend service using Dockerfile.build
+    build:
+      context: .
+      image: cont-int/ci-dockerfile:build
+      args:
+        NODE_VERSION: 18.14.2
+        ALPINE_VERSION: 3.14
+    # Mount built app to /usr/src in the container
+    volumes:
+      - build:/usr/src/
+
+  nginx:
+    container_name: nginx-proxy
+    # Build the nginx service using Dockerfile.stage
+    build:
+      context: .
+      image: cont-int/ci-dockerfile:stage
+      args:
+        NGINX_VERSION: 1.19.6
+        PROXY_API_URL: ${PROXY_API_URL:-http://localhost:8080}
+        password: ${password}
+    # Expose ports 80 and 2222 from the container
+    ports:
+      - '80:80'
+      - '2222:2222'
+    # Enable tty and stdin for the container
+    stdin_open: true
+    tty: true
+    # Mount the build volume to /usr/share/nginx/html in the container
+    volumes:
+      - build:/usr/share/nginx/html
+    # Specify dependencies between services
+    depends_on:
+      - builder
+
+# Define build volume
+volumes:
+  build:

From 1cb2dd0dec99f6daeb6f6788da03fbb54f2d27ea Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:08:49 +0300
Subject: [PATCH 14/36] Update main.yaml

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

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 3812fcf91..f3b4eb627 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -57,6 +57,7 @@ jobs:
           file: ./docker/Dockerfile.stage
           cache-from: type=gha
           cache-to: type=gha, mode=max
+          tags: cont-int/ci-dockerfile:stage
           
       - name: Build Dockerfile.build
         uses: docker/build-push-action@v6
@@ -65,9 +66,10 @@ jobs:
           file: ./docker/Dockerfile.build
           cache-from: type=gha
           cache-to: type=gha, mode=max
+          tags: cont-int/ci-dockerfile:build
 
       - name: Run Docker Compose
-        run: docker compose up -d
+        run: docker compose up -d -f ./compose-gh-ci.yaml
 
 
 

From 331dd9304c2ac895711d28dac9e9fd2a1460ea80 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:13:37 +0300
Subject: [PATCH 15/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index f3b4eb627..699e5c82d 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -69,7 +69,7 @@ jobs:
           tags: cont-int/ci-dockerfile:build
 
       - name: Run Docker Compose
-        run: docker compose up -d -f ./compose-gh-ci.yaml
+        run: docker compose up --file "./compose-gh-ci.yaml" -d 
 
 
 

From 8616d9056dd0b88ce866382331b4766f10af072a Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:16:12 +0300
Subject: [PATCH 16/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 699e5c82d..e9b59a090 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -69,7 +69,7 @@ jobs:
           tags: cont-int/ci-dockerfile:build
 
       - name: Run Docker Compose
-        run: docker compose up --file "./compose-gh-ci.yaml" -d 
+        run: docker compose --file "./compose-gh-ci.yaml" up -d 
 
 
 

From 983a9b8449b792b5c361b4c65865e7f5892b91ff Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:20:45 +0300
Subject: [PATCH 17/36] Update compose-gh-ci.yaml

---
 compose-gh-ci.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compose-gh-ci.yaml b/compose-gh-ci.yaml
index b50b5dee0..b531e77cb 100644
--- a/compose-gh-ci.yaml
+++ b/compose-gh-ci.yaml
@@ -5,7 +5,7 @@ services:
     # Build frontend service using Dockerfile.build
     build:
       context: .
-      image: cont-int/ci-dockerfile:build
+      image: ci-dockerfile:build
       args:
         NODE_VERSION: 18.14.2
         ALPINE_VERSION: 3.14
@@ -18,7 +18,7 @@ services:
     # Build the nginx service using Dockerfile.stage
     build:
       context: .
-      image: cont-int/ci-dockerfile:stage
+      image: ci-dockerfile:stage
       args:
         NGINX_VERSION: 1.19.6
         PROXY_API_URL: ${PROXY_API_URL:-http://localhost:8080}

From c5303f638f25f3046988ab0005bc550a7d0a1a11 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:29:29 +0300
Subject: [PATCH 18/36] Update main.yaml

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

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index e9b59a090..885600b47 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -57,7 +57,7 @@ jobs:
           file: ./docker/Dockerfile.stage
           cache-from: type=gha
           cache-to: type=gha, mode=max
-          tags: cont-int/ci-dockerfile:stage
+          tags: ci-dockerfile:stage
           
       - name: Build Dockerfile.build
         uses: docker/build-push-action@v6
@@ -66,7 +66,7 @@ jobs:
           file: ./docker/Dockerfile.build
           cache-from: type=gha
           cache-to: type=gha, mode=max
-          tags: cont-int/ci-dockerfile:build
+          tags: ci-dockerfile:build
 
       - name: Run Docker Compose
         run: docker compose --file "./compose-gh-ci.yaml" up -d 

From a745775e18e82303833e92a6136d10b2cbc0d103 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:37:54 +0300
Subject: [PATCH 19/36] Update compose-gh-ci.yaml

---
 compose-gh-ci.yaml | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/compose-gh-ci.yaml b/compose-gh-ci.yaml
index b531e77cb..93494f4fd 100644
--- a/compose-gh-ci.yaml
+++ b/compose-gh-ci.yaml
@@ -1,28 +1,20 @@
-version: "3.8"
 services:
   builder:
     container_name: builder
-    # Build frontend service using Dockerfile.build
-    build:
-      context: .
-      image: ci-dockerfile:build
-      args:
-        NODE_VERSION: 18.14.2
-        ALPINE_VERSION: 3.14
-    # Mount built app to /usr/src in the container
+    image: ci-dockerfile:build
+    args:
+      NODE_VERSION: 18.14.2
+      ALPINE_VERSION: 3.14
     volumes:
       - build:/usr/src/
 
   nginx:
     container_name: nginx-proxy
-    # Build the nginx service using Dockerfile.stage
-    build:
-      context: .
-      image: ci-dockerfile:stage
-      args:
-        NGINX_VERSION: 1.19.6
-        PROXY_API_URL: ${PROXY_API_URL:-http://localhost:8080}
-        password: ${password}
+    image: ci-dockerfile:stage
+    args:
+      NGINX_VERSION: 1.19.6
+      PROXY_API_URL: ${PROXY_API_URL:-http://localhost:8080}
+      password: ${password}
     # Expose ports 80 and 2222 from the container
     ports:
       - '80:80'

From fc613bfb6cb300137ad737aaf63ae62c6ef94f1c Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sat, 5 Oct 2024 23:47:57 +0300
Subject: [PATCH 20/36] Update compose-gh-ci.yaml

---
 compose-gh-ci.yaml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/compose-gh-ci.yaml b/compose-gh-ci.yaml
index 93494f4fd..8f9954f65 100644
--- a/compose-gh-ci.yaml
+++ b/compose-gh-ci.yaml
@@ -2,19 +2,12 @@ services:
   builder:
     container_name: builder
     image: ci-dockerfile:build
-    args:
-      NODE_VERSION: 18.14.2
-      ALPINE_VERSION: 3.14
     volumes:
       - build:/usr/src/
 
   nginx:
     container_name: nginx-proxy
     image: ci-dockerfile:stage
-    args:
-      NGINX_VERSION: 1.19.6
-      PROXY_API_URL: ${PROXY_API_URL:-http://localhost:8080}
-      password: ${password}
     # Expose ports 80 and 2222 from the container
     ports:
       - '80:80'

From bb1ccebc03c245cdcba3f52fa6ee5522bf5507eb Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 00:00:12 +0300
Subject: [PATCH 21/36] Update main.yaml

---
 .github/workflows/main.yaml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 885600b47..c76dbf415 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -50,26 +50,30 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Build Dockerfile.stage
+      - name: Build Dockerfile.build
         uses: docker/build-push-action@v6
         with:
           push: false
-          file: ./docker/Dockerfile.stage
+          file: ./docker/Dockerfile.build
           cache-from: type=gha
           cache-to: type=gha, mode=max
-          tags: ci-dockerfile:stage
+          tags: ci-dockerfile:build
+          build-args: |
+            NGINX_VERSION=1.19.6 
+            PROXY_API_URL=${secrets.API_URL}:http://localhost:8080 
+            password=${secrets.SERVER_PASS}
           
-      - name: Build Dockerfile.build
+      - name: Build Dockerfile.stage
         uses: docker/build-push-action@v6
         with:
           push: false
-          file: ./docker/Dockerfile.build
+          file: ./docker/Dockerfile.stage
           cache-from: type=gha
           cache-to: type=gha, mode=max
-          tags: ci-dockerfile:build
+          tags: ci-dockerfile:stage
 
       - name: Run Docker Compose
-        run: docker compose --file "./compose-gh-ci.yaml" up -d 
+        run: docker compose --file "./compose-gh-ci.yaml" up nginx -d
 
 
 

From 1c13c68f8355d787fd7d31d6c82bc5169156c5fe Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 00:03:08 +0300
Subject: [PATCH 22/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index c76dbf415..2be4d7de8 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -60,7 +60,7 @@ jobs:
           tags: ci-dockerfile:build
           build-args: |
             NGINX_VERSION=1.19.6 
-            PROXY_API_URL=${secrets.API_URL}:http://localhost:8080 
+            PROXY_API_URL=${secrets.API_URL}
             password=${secrets.SERVER_PASS}
           
       - name: Build Dockerfile.stage

From cc719e25e86f66ca15ad668f09d3474ff12e9623 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 00:07:25 +0300
Subject: [PATCH 23/36] Update main.yaml

---
 .github/workflows/main.yaml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 2be4d7de8..b9b396e90 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -48,20 +48,7 @@ jobs:
         uses: actions/checkout@v3
         
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build Dockerfile.build
-        uses: docker/build-push-action@v6
-        with:
-          push: false
-          file: ./docker/Dockerfile.build
-          cache-from: type=gha
-          cache-to: type=gha, mode=max
-          tags: ci-dockerfile:build
-          build-args: |
-            NGINX_VERSION=1.19.6 
-            PROXY_API_URL=${secrets.API_URL}
-            password=${secrets.SERVER_PASS}
+        uses: docker/setup-buildx-action@v2 
           
       - name: Build Dockerfile.stage
         uses: docker/build-push-action@v6
@@ -71,6 +58,10 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha, mode=max
           tags: ci-dockerfile:stage
+          build-args: |
+            NGINX_VERSION=1.19.6 
+            PROXY_API_URL=${secrets.API_URL}
+            password=${secrets.SERVER_PASS}
 
       - name: Run Docker Compose
         run: docker compose --file "./compose-gh-ci.yaml" up nginx -d

From 4160690303c3108e4e96f8359947e46822f39aca Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 00:20:07 +0300
Subject: [PATCH 24/36] Update main.yaml

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

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index b9b396e90..ea0ae958e 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -62,6 +62,9 @@ jobs:
             NGINX_VERSION=1.19.6 
             PROXY_API_URL=${secrets.API_URL}
             password=${secrets.SERVER_PASS}
+            
+      - name: test
+        run: docker images 
 
       - name: Run Docker Compose
         run: docker compose --file "./compose-gh-ci.yaml" up nginx -d

From 8a851e8f1f1aa7f91a202668a0010e6c69670f88 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 00:25:55 +0300
Subject: [PATCH 25/36] Update main.yaml

---
 .github/workflows/main.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index ea0ae958e..405fade30 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -62,12 +62,6 @@ jobs:
             NGINX_VERSION=1.19.6 
             PROXY_API_URL=${secrets.API_URL}
             password=${secrets.SERVER_PASS}
-            
-      - name: test
-        run: docker images 
-
-      - name: Run Docker Compose
-        run: docker compose --file "./compose-gh-ci.yaml" up nginx -d
 
 
 

From bd5c6ea5a807db5f766b4dce77e2db3e5fe26661 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:29:43 +0300
Subject: [PATCH 26/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 405fade30..42bd2bd02 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,7 @@ jobs:
         run : npm run lint
         
       - name : Test
-        run: npm test
+        run: npm test --sequence.concurrent
         
       - name : Check Path
         run: ls -la && pwd && ls -la /

From bd589eabb94d546252a4abe254d7a645b88835e9 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:36:14 +0300
Subject: [PATCH 27/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 42bd2bd02..cb85f0fb4 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,7 @@ jobs:
         run : npm run lint
         
       - name : Test
-        run: npm test --sequence.concurrent
+        run: npm test --sequence.concurrent --min-workers 15 --max-workers 20 --fileParallelism
         
       - name : Check Path
         run: ls -la && pwd && ls -la /

From 3993d3f05e471875f1db566e432fa048512cd04d Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:40:01 +0300
Subject: [PATCH 28/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index cb85f0fb4..8f444faf6 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,7 @@ jobs:
         run : npm run lint
         
       - name : Test
-        run: npm test --sequence.concurrent --min-workers 15 --max-workers 20 --fileParallelism
+        run: npm test --sequence.concurrent --min-workers 15 --max-workers 20
         
       - name : Check Path
         run: ls -la && pwd && ls -la /

From 7a5ca317bdd3b189365c70aaa3baf53dbd0c3d60 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:46:27 +0300
Subject: [PATCH 29/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 8f444faf6..b37cdd382 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,7 @@ jobs:
         run : npm run lint
         
       - name : Test
-        run: npm test --sequence.concurrent --min-workers 15 --max-workers 20
+        run: vitest --sequence.concurrent --min-workers 15 --max-workers 20
         
       - name : Check Path
         run: ls -la && pwd && ls -la /

From 030b5b8aafcf4b075dd35d2430d7fa114cab1c13 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:48:52 +0300
Subject: [PATCH 30/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index b37cdd382..ff8e93dbd 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,7 @@ jobs:
         run : npm run lint
         
       - name : Test
-        run: vitest --sequence.concurrent --min-workers 15 --max-workers 20
+        run: npx vitest --sequence.concurrent --min-workers 15 --max-workers 20
         
       - name : Check Path
         run: ls -la && pwd && ls -la /

From 67d6a99ee900539c4a02d4c66f19ee9cec882857 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:51:34 +0300
Subject: [PATCH 31/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index ff8e93dbd..3eb9c3a5b 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,7 @@ jobs:
         run : npm run lint
         
       - name : Test
-        run: npx vitest --sequence.concurrent --min-workers 15 --max-workers 20
+        run: npx vitest --sequence.concurrent --minWorkers 15 --maxWorkers 20
         
       - name : Check Path
         run: ls -la && pwd && ls -la /

From b1537ddfe9f1ead02e5ad408f5e23ff658da7102 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:56:51 +0300
Subject: [PATCH 32/36] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0a2b97de0..bed31faa7 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
     "vite-tsconfig-paths": "^4.2.1",
-    "vitest": "^0.34.6",
+    "vitest": "^2.1.2",
     "vitest-fetch-mock": "^0.2.2",
     "vitest-sonar-reporter": "^0.4.1"
   },

From b6924ca47888d8e4276ba194a95c30148f54110f Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 18:59:55 +0300
Subject: [PATCH 33/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 3eb9c3a5b..6500e0cf3 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,7 @@ jobs:
         run : npm run lint
         
       - name : Test
-        run: npx vitest --sequence.concurrent --minWorkers 15 --maxWorkers 20
+        run: CI=true && npx vitest --sequence.concurrent --minWorkers 15 --maxWorkers 20
         
       - name : Check Path
         run: ls -la && pwd && ls -la /

From beb874711eb9506519d81268522e258834d9ce09 Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 19:02:46 +0300
Subject: [PATCH 34/36] Update main.yaml

---
 .github/workflows/main.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 6500e0cf3..807f25117 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -29,7 +29,7 @@ jobs:
         run : npm run lint
         
       - name : Test
-        run: CI=true && npx vitest --sequence.concurrent --minWorkers 15 --maxWorkers 20
+        run: npx cross-env CI=true vitest --sequence.concurrent --minWorkers 15 --maxWorkers 20
         
       - name : Check Path
         run: ls -la && pwd && ls -la /

From a75ac14daf7b30b79d35e83c0d6848ff087e43cc Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 19:05:42 +0300
Subject: [PATCH 35/36] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bed31faa7..e3634c1e2 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
     "vite-tsconfig-paths": "^4.2.1",
-    "vitest": "^2.1.2",
+    "vitest": "^1.1.0",
     "vitest-fetch-mock": "^0.2.2",
     "vitest-sonar-reporter": "^0.4.1"
   },

From b37cf705f9335b66e641a883c6d52835abe3489f Mon Sep 17 00:00:00 2001
From: new-user888 <146866673+new-user888@users.noreply.github.com>
Date: Sun, 6 Oct 2024 19:17:01 +0300
Subject: [PATCH 36/36] Update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e3634c1e2..0a2b97de0 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-html": "^3.2.0",
     "vite-tsconfig-paths": "^4.2.1",
-    "vitest": "^1.1.0",
+    "vitest": "^0.34.6",
     "vitest-fetch-mock": "^0.2.2",
     "vitest-sonar-reporter": "^0.4.1"
   },