From a5b73f7387ff092100a034b19cd3066225c13281 Mon Sep 17 00:00:00 2001 From: Jeonghyun Lee Date: Fri, 29 Sep 2023 06:09:54 +0900 Subject: [PATCH 1/4] [docs] update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a41adcf4..c647a9dd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @wjdtkdgns @yourzinc @hyunihs @chaeshee0908 @suhhyun524 \ No newline at end of file +* @hyunihs @suhhyun524 @mushroom1324 @haen-su @mirageoasis \ No newline at end of file From a62c4de68418be9a29548431740cc77900a457ae Mon Sep 17 00:00:00 2001 From: Jeonghyun Lee Date: Fri, 29 Sep 2023 06:14:36 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[chore]=20github=20actions=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 6 +++--- .github/workflows/deploy_prod.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index 072eb32a..d4c7023d 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -74,7 +74,7 @@ jobs: with: host: ${{ secrets.EC2_HOST_DEV }} username: ubuntu - key: ${{ secrets.EC2_KEY }} + key: ${{ secrets.EC2_KEY_DEV }} script: mkdir -p ~/srv/ubuntu/ceos_web_dev - name: copy source via ssh key @@ -84,14 +84,14 @@ jobs: remote_path: ~/srv/ubuntu/ remote_host: ${{ secrets.EC2_HOST_DEV }} remote_user: ubuntu - remote_key: ${{ secrets.EC2_KEY }} + remote_key: ${{ secrets.EC2_KEY_DEV }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: host: ${{ secrets.EC2_HOST_DEV }} username: ubuntu - key: ${{ secrets.EC2_KEY }} + key: ${{ secrets.EC2_KEY_DEV }} script: | sh ~/srv/ubuntu/config/scripts/deploy.sh sudo docker stop $(sudo docker ps -a -q) diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index b99dcf24..c03fc2c0 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -74,7 +74,7 @@ jobs: with: host: ${{ secrets.EC2_HOST_PROD }} username: ubuntu - key: ${{ secrets.EC2_KEY }} + key: ${{ secrets.EC2_KEY_PROD }} script: mkdir -p ~/srv/ubuntu/ceos_web_dev - name: copy source via ssh key @@ -84,14 +84,14 @@ jobs: remote_path: ~/srv/ubuntu/ remote_host: ${{ secrets.EC2_HOST_PROD }} remote_user: ubuntu - remote_key: ${{ secrets.EC2_KEY }} + remote_key: ${{ secrets.EC2_KEY_PROD }} - name: executing remote ssh commands using password uses: appleboy/ssh-action@master with: host: ${{ secrets.EC2_HOST_PROD }} username: ubuntu - key: ${{ secrets.EC2_KEY }} + key: ${{ secrets.EC2_KEY_PROD }} script: | sh ~/srv/ubuntu/config/scripts/deploy.sh sudo docker stop $(sudo docker ps -a -q) From d58def2312647f1aa9dcbfa7fa193f44f0585c77 Mon Sep 17 00:00:00 2001 From: Jeonghyun Lee Date: Fri, 29 Sep 2023 06:30:58 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[chore]=20=EA=B0=9C=EB=B0=9C=20=EC=84=9C?= =?UTF-8?q?=EB=B2=84=20=EB=B3=80=EC=88=98=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index d4c7023d..ed7f44b1 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -37,9 +37,9 @@ jobs: - name: Make application-secret.yml run: | touch ./src/main/resources/application-secret.yml - echo "${{ secrets.APPLICATION_SECRET }}" > ./src/main/resources/application-secret.yml + echo "${{ secrets.APPLICATION_SECRET_DEV }}" > ./src/main/resources/application-secret.yml env: - PROPERTIES_DEV: ${{ secrets.APPLICATION_SECRET }} + PROPERTIES_DEV: ${{ secrets.APPLICATION_SECRET_DEV }} # Gradle build - name: Build with Gradle From c6bb379d62d2348007d79e8f0cfd7096d9e100fd Mon Sep 17 00:00:00 2001 From: Jeonghyun Lee Date: Fri, 29 Sep 2023 07:15:12 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[chore]=20docker=20image=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy_dev.yml | 4 ++-- .github/workflows/deploy_prod.yml | 2 +- config/nginx/default.conf | 2 +- docker-compose.dev.yml | 26 ++++++++++++++++++++++++++ docker-compose.yml | 10 +++++----- 5 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 docker-compose.dev.yml diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml index ed7f44b1..88b9db8b 100644 --- a/.github/workflows/deploy_dev.yml +++ b/.github/workflows/deploy_dev.yml @@ -97,6 +97,6 @@ jobs: sudo docker stop $(sudo docker ps -a -q) sudo docker rm $(sudo docker ps -a -q) sudo docker rmi $(sudo docker images -q) - sudo docker-compose -f ~/srv/ubuntu/docker-compose.yml pull - sudo docker-compose -f ~/srv/ubuntu/docker-compose.yml up --build -d + sudo docker-compose -f ~/srv/ubuntu/docker-compose.dev.yml pull + sudo docker-compose -f ~/srv/ubuntu/docker-compose.dev.yml up --build -d diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index c03fc2c0..98ab2ea9 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -67,7 +67,7 @@ jobs: file: ./Dockerfile platforms: linux/amd64 push: true - tags: ${{ secrets.DOCKER_USERNAME }}/ceos-backend-dev + tags: ${{ secrets.DOCKER_USERNAME }}/ceos-backend - name: create remote directory uses: appleboy/ssh-action@master diff --git a/config/nginx/default.conf b/config/nginx/default.conf index d648d69f..22b378a3 100644 --- a/config/nginx/default.conf +++ b/config/nginx/default.conf @@ -4,7 +4,7 @@ server { location / { proxy_set_header Host $host; - proxy_pass http://backend-dev:8080/; + proxy_pass http://backend:8080/; proxy_read_timeout 90; ## try_files $uri $uri/ =404; diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml new file mode 100644 index 00000000..7e2e7001 --- /dev/null +++ b/docker-compose.dev.yml @@ -0,0 +1,26 @@ +version: "3" + +services: + backend: + image: ceos17/ceos-backend-dev + container_name: backend + hostname: backend + expose: + - "8080" + + nginx: + depends_on: + - backend + restart: always + build: + dockerfile: Dockerfile + context: ./config/nginx + ports: + - "80:80" + + redis: + image: redis:latest + container_name: redis + hostname: redis + ports: + - "6379:6379" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index bf06fc2a..f5bf4fc8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,16 +1,16 @@ version: "3" services: - backend-dev: - image: ceos17/ceos-backend-dev - container_name: backend-dev - hostname: backend-dev + backend: + image: ceos17/ceos-backend + container_name: backend + hostname: backend expose: - "8080" nginx: depends_on: - - backend-dev + - backend restart: always build: dockerfile: Dockerfile