Skip to content

Commit 040e566

Browse files
NaGyeong-ParkNaGyeong-Park
authored
Merge 94a63f5 into 2e2655d 
2 parents 2e2655d + 94a63f5 commit 040e566

13 files changed

+48
-163
lines changed

‎.github/workflows/CLIENT_BUILD.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
username: ${{ secrets.RELEASE_USERNAME }}
8585
password: ${{ secrets.RELEASE_PASSWORD }}
8686
port: ${{ secrets.RELEASE_PORT }}
87-
source: "docker-compose.production.yml"
87+
source: "docker-compose.yml"
8888
target: "oao"
8989

9090
- name: 운영 서버에서 Docker Compose 실행
@@ -100,7 +100,7 @@ jobs:
100100
101101
cd oao
102102
103-
docker-compose -f docker-compose.production.yml up -d
103+
docker-compose -f docker-compose.yml up -d
104104
docker image prune
105105
106106
- name: 실패시 슬랙 메시지 전송

‎.github/workflows/CLIENT_DEV_BUILD.yml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -72,32 +72,6 @@ jobs:
7272
tags: ghcr.io/kumsil1006/oao-dev-client
7373
context: ./client
7474

75-
- name: Docker Compose 파일 개발 서버로 복사
76-
uses: appleboy/scp-action@master
77-
with:
78-
host: ${{ secrets.ANOTHER_HOST }}
79-
username: ${{ secrets.ANOTHER_USERNAME }}
80-
password: ${{ secrets.ANOTHER_PASSWORD }}
81-
port: ${{ secrets.ANOTHER_PORT }}
82-
source: "docker-compose.yml"
83-
target: "oao"
84-
85-
- name: 개발 서버에서 Docker Compose 실행
86-
uses: appleboy/ssh-action@master
87-
with:
88-
host: ${{ secrets.ANOTHER_HOST }}
89-
username: ${{ secrets.ANOTHER_USERNAME }}
90-
password: ${{ secrets.ANOTHER_PASSWORD }}
91-
port: ${{ secrets.ANOTHER_PORT }}
92-
script: |
93-
echo ${{secrets.CONTAINER_REGISTRY_TOKEN}} | docker login ghcr.io -u kumsil1006 --password-stdin
94-
docker pull ghcr.io/kumsil1006/oao-dev-client
95-
96-
cd oao
97-
98-
docker-compose up -d
99-
docker image prune
100-
10175
- name: 실패시 슬랙 메시지 전송
10276
if: ${{ failure() }}
10377
uses: ./.github/actions/slack-notify

‎.github/workflows/PROXY_BUILD.yml‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches:
55
- release
66
paths:
7-
- "nginx/Dockerfile.production"
7+
- "nginx/Dockerfile"
88

99
jobs:
1010
proxy-build:
@@ -20,22 +20,14 @@ jobs:
2020
username: kumsil1006
2121
password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
2222

23-
- name: Docker images build 및 GitHub Container Registry로 push
24-
uses: docker/[email protected]
25-
with:
26-
push: true
27-
tags: ghcr.io/kumsil1006/oao-proxy
28-
context: ./nginx
29-
file: ./nginx/Dockerfile.production
30-
3123
- name: Docker Compose 파일 운영 서버로 복사
3224
uses: appleboy/scp-action@master
3325
with:
3426
host: ${{ secrets.RELEASE_HOST }}
3527
username: ${{ secrets.RELEASE_USERNAME }}
3628
password: ${{ secrets.RELEASE_PASSWORD }}
3729
port: ${{ secrets.RELEASE_PORT }}
38-
source: "docker-compose.production.yml"
30+
source: "docker-compose.yml"
3931
target: "oao"
4032

4133
- name: 운영 서버에서 Docker Compose 실행
@@ -48,10 +40,10 @@ jobs:
4840
script: |
4941
echo ${{secrets.CONTAINER_REGISTRY_TOKEN}} | docker login ghcr.io -u kumsil1006 --password-stdin
5042
docker pull ghcr.io/kumsil1006/oao-proxy
51-
43+
5244
cd oao
53-
54-
docker-compose -f docker-compose.production.yml up -d
45+
46+
docker-compose -f docker-compose.yml up -d
5547
docker image prune
5648
5749
- name: 실패시 슬랙 메시지 전송

‎.github/workflows/PROXY_DEV_BUILD.yml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,6 @@ jobs:
2727
tags: ghcr.io/kumsil1006/oao-dev-proxy
2828
context: ./nginx
2929

30-
- name: Docker Compose 파일 개발 서버로 복사
31-
uses: appleboy/scp-action@master
32-
with:
33-
host: ${{ secrets.ANOTHER_HOST }}
34-
username: ${{ secrets.ANOTHER_USERNAME }}
35-
password: ${{ secrets.ANOTHER_PASSWORD }}
36-
port: ${{ secrets.ANOTHER_PORT }}
37-
source: "docker-compose.yml"
38-
target: "oao"
39-
40-
- name: 개발 서버에서 Docker Compose 실행
41-
uses: appleboy/ssh-action@master
42-
with:
43-
host: ${{ secrets.ANOTHER_HOST }}
44-
username: ${{ secrets.ANOTHER_USERNAME }}
45-
password: ${{ secrets.ANOTHER_PASSWORD }}
46-
port: ${{ secrets.ANOTHER_PORT }}
47-
script: |
48-
echo ${{secrets.CONTAINER_REGISTRY_TOKEN}} | docker login ghcr.io -u kumsil1006 --password-stdin
49-
docker pull ghcr.io/kumsil1006/oao-dev-proxy
50-
51-
cd oao
52-
53-
docker-compose up -d
54-
docker image prune
55-
5630
- name: 실패시 슬랙 메시지 전송
5731
if: ${{ failure() }}
5832
uses: ./.github/actions/slack-notify

‎.github/workflows/SERVER_BUILD.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
username: ${{ secrets.RELEASE_USERNAME }}
5454
password: ${{ secrets.RELEASE_PASSWORD }}
5555
port: ${{ secrets.RELEASE_PORT }}
56-
source: "docker-compose.production.yml"
56+
source: "docker-compose.yml"
5757
target: "oao"
5858

5959
- name: 운영 서버에서 Docker Compose 실행
@@ -69,7 +69,7 @@ jobs:
6969
7070
cd oao
7171
72-
docker-compose -f docker-compose.production.yml up -d
72+
docker-compose -f docker-compose.yml up -d
7373
docker image prune
7474
7575
- name: 실패시 슬랙 메시지 전송

‎.github/workflows/SERVER_DEV_BUILD.yml‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,6 @@ jobs:
4040
push: true
4141
tags: ghcr.io/kumsil1006/oao-dev-server
4242

43-
- name: Docker Compose 파일 개발 서버로 복사
44-
uses: appleboy/scp-action@master
45-
with:
46-
host: ${{ secrets.ANOTHER_HOST }}
47-
username: ${{ secrets.ANOTHER_USERNAME }}
48-
password: ${{ secrets.ANOTHER_PASSWORD }}
49-
port: ${{ secrets.ANOTHER_PORT }}
50-
source: "docker-compose.yml"
51-
target: "oao"
52-
53-
- name: 개발 서버에서 Docker Compose 실행
54-
uses: appleboy/ssh-action@master
55-
with:
56-
host: ${{ secrets.ANOTHER_HOST }}
57-
username: ${{ secrets.ANOTHER_USERNAME }}
58-
password: ${{ secrets.ANOTHER_PASSWORD }}
59-
port: ${{ secrets.ANOTHER_PORT }}
60-
script: |
61-
echo ${{secrets.CONTAINER_REGISTRY_TOKEN}} | docker login ghcr.io -u kumsil1006 --password-stdin
62-
docker pull ghcr.io/kumsil1006/oao-dev-server
63-
64-
cd oao
65-
66-
docker-compose up -d
67-
docker image prune
68-
6943
- name: 실패시 슬랙 메시지 전송
7044
if: ${{ failure() }}
7145
uses: ./.github/actions/slack-notify

‎client/vercel.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"rewrites": [{ "source": "/(.*)", "destination": "/" }]
3+
}

‎docker-compose.production.yml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎docker-compose.yml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
11
version: "3.9"
22
services:
33
proxy:
4-
image: "ghcr.io/kumsil1006/oao-dev-proxy:latest"
4+
image: "nginx:latest"
55
ports:
66
- "80:80"
7+
- "443:443"
78
restart: always
9+
volumes:
10+
- ./nginx/default.conf:/etc/nginx/conf.d/default.conf
11+
- ./data/certbot/conf:/etc/letsencrypt
12+
- ./data/certbot/www:/var/www/certbot
13+
command: '/bin/sh -c ''while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g "daemon off;"'''
14+
15+
certbot:
16+
image: "certbot/certbot"
17+
restart: unless-stopped
18+
volumes:
19+
- ./data/certbot/conf:/etc/letsencrypt
20+
- ./data/certbot/www:/var/www/certbot
21+
entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
22+
823
frontend:
9-
image: "ghcr.io/kumsil1006/oao-dev-client:latest"
24+
image: "ghcr.io/kumsil1006/oao-client:latest"
1025
restart: always
1126
expose:
1227
- "3000"
1328
backend:
14-
image: "ghcr.io/kumsil1006/oao-dev-server:latest"
29+
image: "ghcr.io/kumsil1006/oao-server:latest"
1530
restart: always
1631
expose:
1732
- "8080"

‎nginx/Dockerfile‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)