diff --git a/.github/workflows/deploy-user-docker.yml b/.github/workflows/deploy-user-docker.yml index b059db61..08729726 100644 --- a/.github/workflows/deploy-user-docker.yml +++ b/.github/workflows/deploy-user-docker.yml @@ -77,6 +77,16 @@ jobs: source: "docker-compose.yml" target: ${{ env.EC2_DEPLOY_PATH }} + - name: Copy deploy-user-docker to EC2 + uses: appleboy/scp-action@master + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USER }} + key: ${{ secrets.EC2_SSH_KEY }} + port: ${{ secrets.EC2_PORT }} + source: "scripts/deploy-user-docker" + target: "${{ env.EC2_DEPLOY_PATH }}" + - name: Login to DockerHub uses: docker/login-action@v1 with: @@ -97,7 +107,6 @@ jobs: envs: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION script: | cd ${{ env.EC2_DEPLOY_PATH }} - sudo docker rm -f nowait-app-user-api || true - sudo docker-compose -p nowait_dev pull nowait-app-user-api - sudo docker-compose -p nowait_dev up -d nowait-app-user-api + chmod +x ./scripts/deploy-user-docker + ./scripts/deploy-user-docker diff --git a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java index 363e737d..1098599d 100644 --- a/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java +++ b/nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java @@ -10,4 +10,3 @@ public static void main(String[] args) { org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args); } } - diff --git a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java index 8e25d58f..07db6d34 100644 --- a/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java +++ b/nowait-app-user-api/src/main/java/com/nowait/ApiUserApplication.java @@ -11,4 +11,3 @@ public static void main(String[] args) { SpringApplication.run(ApiUserApplication.class, args); } } - diff --git a/scripts/deploy-user-docker.sh b/scripts/deploy-user-docker.sh new file mode 100644 index 00000000..0b8d7d9a --- /dev/null +++ b/scripts/deploy-user-docker.sh @@ -0,0 +1,27 @@ +#!/bin/bash + +REPOSITORY="/home/ubuntu/spring-github-action-user-docker" +cd $REPOSITORY + +START_LOG="$REPOSITORY/start.log" + +echo "1. find container id" +CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-user-api") + +echo "2. stop container" +if [ -n "$CONTAINER_ID" ]; then + echo "Stopping container $CONTAINER_ID" + docker rm -f "$CONTAINER_ID" +else + echo "No user container found." +fi + +echo "3. start container" +sudo docker-compose -p nowait_dev pull nowait-app-user-api +sudo docker-compose -p nowait_dev up -d nowait-app-user-api + +echo "4. check container status" +NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-user-api") +NOW=$(date +%c) + +echo "[$NOW] > Container ID: $NEW_CONTAINER_ID"