From f2c727dea5d3dd78fd6b3527c773d176ece5ed70 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 11:23:32 +0900 Subject: [PATCH 01/15] Update aws.yml --- .github/workflows/aws.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index a592229..6ab3fd8 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -35,8 +35,10 @@ jobs: run: | touch src/main/resources/application-oauth.properties touch src/main/resources/application-prod.properties + touch src/main/resources/application.properties echo "${{ secrets.APPLICATION_PROD }}" > src/main/resources/application-prod.properties echo "${{ secrets.APPLICATION_OAUTH }}" > src/main/resources/application-oauth.properties + echo "${{ secrets.APPLICATION_PROPERTIES }}" > src/main/resources/application.properties cat src/main/resources/application-prod.properties chmod +x gradlew ./gradlew clean build From 9d5b4a9725b81d9d62aa6063ae82d5bb991ae121 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 11:27:37 +0900 Subject: [PATCH 02/15] Update aws.yml --- .github/workflows/aws.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 6ab3fd8..02e1acc 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -41,7 +41,7 @@ jobs: echo "${{ secrets.APPLICATION_PROPERTIES }}" > src/main/resources/application.properties cat src/main/resources/application-prod.properties chmod +x gradlew - ./gradlew clean build + ./gradlew clean build --exclude-task test ls pwd docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/streaming . From 95f1f37175c72d8c284ef4fa77e165cdadff441c Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 11:47:06 +0900 Subject: [PATCH 03/15] Update aws.yml --- .github/workflows/aws.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 02e1acc..96f8f04 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -47,7 +47,7 @@ jobs: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/streaming . docker push ${{ secrets.DOCKERHUB_USERNAME }}/streaming:latest - cd live-streaming + cd /live-streaming docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nginx-rtmp:ssl . docker push ${{ secrets.DOCKERHUB_USERNAME }}/nginx-rtmp:ssl From 18bd83d5f2a8d92443a7477fdb8a5b7511cf31d9 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 11:51:14 +0900 Subject: [PATCH 04/15] Update aws.yml --- .github/workflows/aws.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 96f8f04..11938ee 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -47,7 +47,7 @@ jobs: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/streaming . docker push ${{ secrets.DOCKERHUB_USERNAME }}/streaming:latest - cd /live-streaming + cd live-streamming docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/nginx-rtmp:ssl . docker push ${{ secrets.DOCKERHUB_USERNAME }}/nginx-rtmp:ssl From 5b5df3699f40bad350eda0b13e5260ae159b4f21 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 11:58:22 +0900 Subject: [PATCH 05/15] Update aws.yml --- .github/workflows/aws.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 11938ee..cf5adcd 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -78,6 +78,7 @@ jobs: sudo curl -L https://github.com/docker/compose/releases/download/${VERSION}/docker-compose-$(uname -s)-$(uname -m) -o $DESTINATION sudo chmod 755 $DESTINATION sudo systemctl start docker + sudo cd video-streaming sudo docker pull van133/streaming sudo docker pull van133/nginx-rtmp:ssl sudo docker-compose build From 5b2b386ae4f882d283ba073c5620f9104e335d16 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 12:05:42 +0900 Subject: [PATCH 06/15] Update aws.yml --- .github/workflows/aws.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index cf5adcd..e92322c 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -81,6 +81,6 @@ jobs: sudo cd video-streaming sudo docker pull van133/streaming sudo docker pull van133/nginx-rtmp:ssl - sudo docker-compose build + #sudo docker-compose build #sudo sh ./init-letsencrypt.sh - sudo docker-compose up -d + sudo docker compose up -d From 85e1ddd066a2692c469ff9e51219052188936f9b Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 12:11:55 +0900 Subject: [PATCH 07/15] Update aws.yml --- .github/workflows/aws.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index e92322c..dace3d7 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -80,7 +80,7 @@ jobs: sudo systemctl start docker sudo cd video-streaming sudo docker pull van133/streaming - sudo docker pull van133/nginx-rtmp:ssl + #sudo docker pull van133/nginx-rtmp:ssl #sudo docker-compose build #sudo sh ./init-letsencrypt.sh sudo docker compose up -d From 6c0dd7e6236b92c02e52fd4283353151bb0fabd5 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 12:18:00 +0900 Subject: [PATCH 08/15] Update aws.yml --- .github/workflows/aws.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index dace3d7..79b7708 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -68,19 +68,9 @@ jobs: username: ubuntu key: ${{ secrets.SSH_PRIVATE_KEY }} script: | - sudo apt-get update - sudo apt-get install ec2-instance-connect - sudo apt-get install docker.io -y - sudo apt-get install docker-compose -y - sudo apt-get install jq -y - VERSION=$(curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r) - DESTINATION=/usr/bin/docker-compose - sudo curl -L https://github.com/docker/compose/releases/download/${VERSION}/docker-compose-$(uname -s)-$(uname -m) -o $DESTINATION - sudo chmod 755 $DESTINATION - sudo systemctl start docker sudo cd video-streaming sudo docker pull van133/streaming - #sudo docker pull van133/nginx-rtmp:ssl + sudo docker pull van133/nginx-rtmp:ssl #sudo docker-compose build #sudo sh ./init-letsencrypt.sh sudo docker compose up -d From f6074cf2559c027f693bf8b752e353486d14aef3 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 12:24:41 +0900 Subject: [PATCH 09/15] Update aws.yml --- .github/workflows/aws.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 79b7708..84c7610 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -68,7 +68,10 @@ jobs: username: ubuntu key: ${{ secrets.SSH_PRIVATE_KEY }} script: | - sudo cd video-streaming + sudo cd app + pwd + ls + pwd sudo docker pull van133/streaming sudo docker pull van133/nginx-rtmp:ssl #sudo docker-compose build From 8f332d113f915205ede8b9b6da506172f86badcd Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 12:30:24 +0900 Subject: [PATCH 10/15] Update aws.yml --- .github/workflows/aws.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 84c7610..589ddca 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -68,7 +68,7 @@ jobs: username: ubuntu key: ${{ secrets.SSH_PRIVATE_KEY }} script: | - sudo cd app + cd app pwd ls pwd From 231eb4c95498127a55e2d4578a43069e0c280b12 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 12:36:21 +0900 Subject: [PATCH 11/15] Update aws.yml --- .github/workflows/aws.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 589ddca..25a8732 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -69,6 +69,7 @@ jobs: key: ${{ secrets.SSH_PRIVATE_KEY }} script: | cd app + sudo docker compose down pwd ls pwd From ecd942089bbb6742a7f719bc23eb8e5ade989720 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 13:10:28 +0900 Subject: [PATCH 12/15] Update aws.yml --- .github/workflows/aws.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 25a8732..60758ea 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -70,6 +70,7 @@ jobs: script: | cd app sudo docker compose down + docker rm -f $(docker ps -qa) pwd ls pwd From 9e126f1d87dec8214bfb66e0bfca5aca4f5b2d4e Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 13:16:05 +0900 Subject: [PATCH 13/15] Update aws.yml --- .github/workflows/aws.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 60758ea..515dcd8 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -70,7 +70,7 @@ jobs: script: | cd app sudo docker compose down - docker rm -f $(docker ps -qa) + sudo docker rm -f $(docker ps -qa) pwd ls pwd From b6eada1567b9a789b9064f6cd622077825843ab4 Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 13:22:41 +0900 Subject: [PATCH 14/15] Update aws.yml --- .github/workflows/aws.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 515dcd8..29e68a9 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -70,7 +70,7 @@ jobs: script: | cd app sudo docker compose down - sudo docker rm -f $(docker ps -qa) + sudo docker rm -f $(sudo docker ps -qa) pwd ls pwd From 65ff339fe33708aaf3ea6f476ac48c0cd990704e Mon Sep 17 00:00:00 2001 From: Sihwan Kim Date: Mon, 22 Apr 2024 13:35:07 +0900 Subject: [PATCH 15/15] Update aws.yml --- .github/workflows/aws.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml index 29e68a9..a3af2d8 100644 --- a/.github/workflows/aws.yml +++ b/.github/workflows/aws.yml @@ -71,6 +71,7 @@ jobs: cd app sudo docker compose down sudo docker rm -f $(sudo docker ps -qa) + sudo cp -r ../video-streaming/data ./ pwd ls pwd