Merge branch 'main' of https://github.com/van1164/video-streaming

van1164 · Apr 22, 2024 · d75ea07 · d75ea07
2 parents f26da0c + 65ff339
commit d75ea07
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/.github/workflows/aws.yml b/.github/workflows/aws.yml
@@ -35,17 +35,19 @@ 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
+          ./gradlew clean build --exclude-task test
           ls
           pwd
           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
 
@@ -66,18 +68,15 @@ 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
+          cd app
+          sudo docker compose down
+          sudo docker rm -f $(sudo docker ps -qa)
+          sudo cp -r ../video-streaming/data ./
+          pwd
+          ls
+          pwd
           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