From 9812e084926632981addb3c0577dd4ea78eb7881 Mon Sep 17 00:00:00 2001 From: Allower <150520849+Allower9@users.noreply.github.com> Date: Sun, 29 Jun 2025 02:38:49 +0300 Subject: [PATCH 1/5] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 644e09a..cec12e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,7 @@ on: - main - dev - test + - test-dev jobs: build-and-push: From 69d74545f12024404a31b0854144e6db368ab6f7 Mon Sep 17 00:00:00 2001 From: Allower <150520849+Allower9@users.noreply.github.com> Date: Sun, 29 Jun 2025 02:54:26 +0300 Subject: [PATCH 2/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2684855..3736d07 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Deploying-Frontend-apps +# Deploying-Frontend-apps- # Deploying Frontend Apps: React + Nginx + CI/CD πŸš€ ## πŸ“¦ ВСхнологичСский стСк From f2abe8653c17f49342a797ef75734305b1c89a62 Mon Sep 17 00:00:00 2001 From: Allower <150520849+Allower9@users.noreply.github.com> Date: Sun, 29 Jun 2025 03:01:53 +0300 Subject: [PATCH 3/5] Update docker-compose.yaml --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 0d1c0d5..7940c3e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ version: '3.9' services: # Frontend-ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ frontend: - build: . + image: allower99/nginx:latest container_name: frontend hostname: frontend ports: From a57370194a663e9f734028d6511d524bb1894bfe Mon Sep 17 00:00:00 2001 From: Allower <150520849+Allower9@users.noreply.github.com> Date: Sun, 29 Jun 2025 03:07:53 +0300 Subject: [PATCH 4/5] Update docker-compose.yaml --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 7940c3e..c8ca3e8 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ version: '3.9' services: # Frontend-ΠΏΡ€ΠΈΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅ frontend: - image: allower99/nginx:latest + image: allower99/frontend:latest container_name: frontend hostname: frontend ports: From b7619ed24575e078b436c3aae5a87b9637cdc06e Mon Sep 17 00:00:00 2001 From: Allower <150520849+Allower9@users.noreply.github.com> Date: Sun, 29 Jun 2025 03:10:40 +0300 Subject: [PATCH 5/5] Update main.yml --- .github/workflows/main.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cec12e5..4d49cdc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -61,10 +61,9 @@ jobs: run: | ssh -o StrictHostKeyChecking=no user1@${{ secrets.PROD_SERVER_IP_1 }} << 'EOF' cd /home/user1/Deploying-Frontend-apps + sudo docker-compose down -v sudo docker pull ${{ secrets.DOCKER_USERNAME }}/frontend:latest - sudo docker stop frontend || true - sudo docker rm frontend || true - sudo docker run -d --name frontend -p 80:80 ${{ secrets.DOCKER_USERNAME }}/frontend:latest + sudo docker-compose up -d echo "Deployment completed!" sudo docker ps EOF @@ -81,9 +80,8 @@ jobs: run: | ssh -o StrictHostKeyChecking=no user1@${{ secrets.PROD_SERVER_IP_2 }} << 'EOF' cd /home/user1/Deploying-Frontend-apps + sudo docker-compose down -v sudo docker pull ${{ secrets.DOCKER_USERNAME }}/frontend:latest - sudo docker stop frontend || true - sudo docker rm frontend || true - sudo docker run -d --name frontend -p 80:80 ${{ secrets.DOCKER_USERNAME }}/frontend:latest + sudo docker-compose up -d echo "Deployment completed!" sudo docker ps