diff --git a/.github/workflows/frontend-deploy-dev.yml b/.github/workflows/frontend-deploy-dev.yml index 22dd7f7d..32387626 100644 --- a/.github/workflows/frontend-deploy-dev.yml +++ b/.github/workflows/frontend-deploy-dev.yml @@ -1,6 +1,7 @@ name: Frontend Deploy to Dev on: + pull_request: push: branches: - develop @@ -58,29 +59,19 @@ jobs: context: ./frontend file: ./frontend/Dockerfile.dev push: true - tags: ${{ secrets.FRONTEND_IMAGE_NAME }}:latest + tags: ${{ secrets.FRONTEND_ALPHA_IMAGE_NAME }}:latest platforms: | linux/amd64 linux/arm64 - deploy-to-develop-EC2: - needs: build-dockerfile - runs-on: front-dev-server - - steps: - - name: Deploy to Develop EC2 - run: | - docker stop ${{ secrets.FRONTEND_CONTAINER_NAME }} || true - docker rm ${{ secrets.FRONTEND_CONTAINER_NAME }} || true - docker pull ${{ secrets.FRONTEND_IMAGE_NAME }}:latest - docker run -d -p 3000:3000 --name ${{ secrets.FRONTEND_CONTAINER_NAME }} ${{ secrets.FRONTEND_IMAGE_NAME }}:latest - - - name: Slack Notification - uses: 8398a7/action-slack@v3 + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v4 with: - status: ${{ job.status }} - author_name: 프론트엔드 배포 알림 - fields: repo,message,commit,author,action,eventName,ref,workflow,job,took - env: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - if: always() + role-to-assume: arn:aws:iam::791335373803:role/SendCommandToEc2FromGithub + aws-region: ${{ secrets.AWS_REGION }} + - name: CD on EC2 + uses: zip-go/aws-ssm-action@v1.0.0 + instanceName: ${{ secrets.ALPHA_INSTANCE_NAME }} + workingDirectory: ${{ secrets.ALPHA_WORKING_DIRECTORY }} + command: | + docker compose restart zipgo-frontend \ No newline at end of file diff --git a/backend/docker-compose.dev.yml b/backend/docker-compose.dev.yml index 3ae77437..38462a15 100644 --- a/backend/docker-compose.dev.yml +++ b/backend/docker-compose.dev.yml @@ -21,3 +21,5 @@ services: env_file: "env.dev.properties" ports: - "8080:8080" + depends_on: + - mysql diff --git a/frontend/.env.development b/frontend/.env.development index 75040554..cb0050c7 100644 --- a/frontend/.env.development +++ b/frontend/.env.development @@ -1,3 +1,3 @@ FAST_REFRESH=true -BASE_URL=https://dev.api.zipgo.pet +BASE_URL=http://zipgo-backend HOMEPAGE=https://dev.zipgo.pet