Update server.yml

Donga1125 · Mar 2, 2024 · e720c8d · e720c8d
1 parent 825b57c
commit e720c8d
Showing 1 changed file with 21 additions and 28 deletions.
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -61,36 +61,29 @@ jobs:
           docker tag celebee-server ${{secrets.DOCKER_HUB_USERNAME}}/celebee-server:${GITHUB_SHA::7}
           docker push ${{secrets.DOCKER_HUB_USERNAME}}/celebee-server:${GITHUB_SHA::7}
 
-      - name: Configure AWS credentials
+
+      - name: Deploy to Server
         uses: aws-actions/configure-aws-credentials@v1
+        env:
+          DOCKER_HUB_USERNAME: ${{secrets.DOCKER_HUB_USERNAME}}
+          DOCKER_HUB_PASSWORD: ${{secrets.DOCKER_HUB_PASSWORD}}
+          AWS_ACCESS_KEY: ${{secrets.AWS_ACCESS_KEY}}
+          AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}
+          JWT_SECRET_KEY: ${{secrets.JWT_SECRET_KEY}}
+          MYSQL_DATABASE_PASSWORD: ${{secrets.MYSQL_DATABASE_PASSWORD}}
+          MYSQL_DATABASE_URL: ${{secrets.MYSQL_DATABASE_URL}}
+          MYSQL_DATABASE_USERNAME: ${{secrets.MYSQL_DATABASE_USERNAME}}
+          KAKAO_CLIENT_ID: ${{secrets.KAKAO_CLIENT_ID}}
+          KAKAO_CLIENT_SECRET: ${{secrets.KAKAO_CLIENT_SECRET}}
+          MAIL_USERNAME: ${{secrets.MAIL_USERNAME}}
+          MAIL_PASSWORD: ${{secrets.MAIL_PASSWORD}}
         with:
           aws-access-key-id: ${{secrets.AWS_ACCESS_KEY}}
           aws-secret-access-key: ${{secrets.AWS_SECRET_ACCESS_KEY}}
           aws-region: ap-northeast-2
-
-      - name: Deploy to Server
-        run: |
-          aws ssm send-command \
-            --instance-id i-0bb0f132aa82958ba \
-            --document-name "AWS-RunShellScript" \
-            --parameters "commands=[
-              'if sudo docker ps -a --format \\'{{.Names}}\\' | grep -q \'^server$\\'; then',
-              '  sudo docker stop server',
-              '  sudo docker rm server',
-              'fi',
-              'sudo docker pull ${{secrets.DOCKER_HUB_USERNAME}}/celebee-server:${GITHUB_SHA::7}',
-              'sudo docker run -d --name server -p 8080:8080 \
-                -e AWS_ACCESS_KEY=${{secrets.AWS_ACCESS_KEY}} \
-                -e AWS_SECRET_ACCESS_KEY=${{secrets.AWS_SECRET_ACCESS_KEY}} \
-                -e DOCKER_HUB_PASSWORD=${{secrets.DOCKER_HUB_PASSWORD}} \
-                -e DOCKER_HUB_USERNAME=${{secrets.DOCKER_HUB_USERNAME}} \
-                -e JWT_SECRET_KEY=${{secrets.JWT_SECRET_KEY}} \
-                -e MYSQL_DATABASE_PASSWORD=${{secrets.MYSQL_DATABASE_PASSWORD}} \
-                -e MYSQL_DATABASE_URL=${{secrets.MYSQL_DATABASE_URL}} \
-                -e MYSQL_DATABASE_USERNAME=${{secrets.MYSQL_DATABASE_USERNAME}} \
-                -e KAKAO_CLIENT_ID=${{secrets.KAKAO_CLIENT_ID}} \
-                -e KAKAO_CLIENT_SECRET=${{secrets.KAKAO_CLIENT_SECRET}} \
-                -e MAIL_USERNAME=${{secrets.MAIL_USERNAME}} \
-                -e MAIL_PASSWORD=${{secrets.MAIL_PASSWORD}} \
-                ${{secrets.DOCKER_HUB_USERNAME}}/celebee-server:${GITHUB_SHA::7}'
-            ]"
+          script: |
+            sudo docker login -u ${{secrets.DOCKER_HUB_USERNAME}} -p ${{secrets.DOCKER_HUB_PASSWORD}}
+            sudo docker rm -f $(sudo docker ps -qa)
+            sudo docker pull ${{secrets.DOCKER_HUB_USERNAME}}/celebee-server:${GITHUB_SHA::7}
+            sudo docker-compose up -d
+            sudo docker image prune -f