From 01e563285664a22ec8cd8058eed9a1699876dbb7 Mon Sep 17 00:00:00 2001
From: ITQ <itq.dev@ya.ru>
Date: Mon, 1 Apr 2024 00:33:36 +0300
Subject: [PATCH] [fix] Fixed docker and CI/CD

---
 .github/workflows/backend.yml  | 4 ++--
 .github/workflows/frontend.yml | 8 ++++++--
 docker-compose.yml             | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index a04b460..ca60d82 100755
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -66,6 +66,6 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
       - name: Build Docker image
-        run: docker build -t skillhub/backend backend/
+        run: docker build -t skillhub_backend backend/
       - name: Push Docker image
-        run: docker push skillhub/backend
+        run: docker push skillhub_backend
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index e932873..d657bbc 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -12,6 +12,8 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '18'
+      - name: Change directory
+        run: cd frontend
       - name: Install dependencies
         run: npm install
       - name: Linting
@@ -28,6 +30,8 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: '18'
+      - name: Change directory
+        run: cd frontend
       - name: Install dependencies
         run: npm install
       - name: Build
@@ -40,5 +44,5 @@ jobs:
           password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
       - name: Build and push Docker image
         run: |
-          docker build -t skillhub/frontend frontend/
-          docker push skillhub/frontend
+          docker build -t skillhub-backend frontend/
+          docker push skillhub-backend
diff --git a/docker-compose.yml b/docker-compose.yml
index 385d6ed..b337e73 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
 
   backend:
     build: ./backend
-    container_name: backend
+    container_name: itqdev/skillhub-backend
     depends_on:
       postgres:
         condition: service_healthy
@@ -43,7 +43,7 @@ services:
       - 8080:8080
   
   frontend:
-    container_name: frontend
+    container_name: itqdev/skillhub-backend
     build:
       context: ./frontend
       dockerfile: Dockerfile