Skip to content

Commit b9cb40e

Browse files
hwangdaesunhwangdaesun
authored
Merge pull request #622 from JNU-econovation/develop
[Release] Version 1.0.0 배포
2 parents 187aba4 + aae41e8 commit b9cb40e

File tree

57 files changed

+782
-615
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+782
-615
lines changed

‎.github/workflows/devWorkflow.yml

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
pull_request:
55
branches:
66
- develop
7-
types:
8-
- closed
97

108
jobs:
119
build:
@@ -44,61 +42,3 @@ jobs:
4442
with:
4543
paths: ${{ github.workspace }}/build/reports/jacoco/test/jacocoTestReport.xml
4644
token: ${{ secrets.GITHUB_TOKEN }}
47-
48-
- name: Send docker-compose.yml
49-
uses: appleboy/scp-action@master
50-
with:
51-
host: ${{ secrets.SSH_HOST }}
52-
username: ${{ secrets.SSH_USERNAME }}
53-
key: ${{ secrets.SSH_KEY }}
54-
source: ./docker-compose.yml
55-
target: /home/ubuntu/backend-deploy
56-
57-
- name: Send resources-develop-environment
58-
uses: appleboy/scp-action@master
59-
with:
60-
host: ${{ secrets.SSH_HOST }}
61-
username: ${{ secrets.SSH_USERNAME }}
62-
key: ${{ secrets.SSH_KEY }}
63-
source: ./resources/gaebaljip-develop-environment
64-
target: /home/ubuntu/backend-deploy
65-
66-
- name: Create .env file
67-
run: |
68-
echo "${{ secrets.ENV_VARS }}" > .env
69-
70-
- name: Send env file
71-
uses: appleboy/scp-action@master
72-
with:
73-
host: ${{ secrets.SSH_HOST }}
74-
username: ${{ secrets.SSH_USERNAME }}
75-
key: ${{ secrets.SSH_KEY }}
76-
source: ./.env
77-
target: /home/ubuntu/backend-deploy
78-
79-
- name: Docker Image Build
80-
run: docker build -t ${{ secrets.DOCKER_HUB_USER_NAME }}/gaebaljip-dev:latest .
81-
82-
- name: Docker Hub Login
83-
uses: docker/login-action@v2
84-
with:
85-
username: ${{ secrets.DOCKER_HUB_USER_NAME }}
86-
password: ${{ secrets.DOCKER_HUB_TOKEN }}
87-
88-
- name: docker Hub Push
89-
run: docker push ${{ secrets.DOCKER_HUB_USER_NAME }}/gaebaljip-dev:latest
90-
91-
- name: SSH Deploy
92-
uses: appleboy/ssh-action@v1.0.3
93-
with:
94-
host: ${{ secrets.SSH_HOST }}
95-
username: ${{ secrets.SSH_USERNAME }}
96-
key: ${{ secrets.SSH_KEY }}
97-
script: |
98-
cd backend-deploy/BE/exceed
99-
sudo docker-compose down
100-
sudo docker pull ${{ secrets.DOCKER_HUB_USER_NAME }}/gaebaljip-dev:latest
101-
sudo docker-compose up --build -d
102-
sudo docker image prune -a -f
103-
104-

‎docker-compose-dev.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
version: '3'
2+
services:
3+
eatceed-mariadb:
4+
image: mariadb:10.6
5+
container_name: gaebaljip-mariadb
6+
ports:
7+
- "3306:3306"
8+
volumes:
9+
- ./resources/gaebaljip-develop-environment/mariadb-conf:/etc/mysql/conf.d
10+
- ./resources/gaebaljip-develop-environment/mariadb-init/01_schema.sql:/docker-entrypoint-initdb.d/init.sql
11+
environment:
12+
- MARIADB_ROOT_PASSWORD=eatceed
13+
- MYSQL_DATABASE=gaebaljip
14+
- MYSQL_USER=gaebaljip-dev
15+
- MYSQL_PASSWORD=gaebaljip-dev
16+
networks:
17+
- gaebaljip-network
18+
19+
eatceed-redis:
20+
image: redis:alpine
21+
container_name: gaebaljip-redis
22+
ports:
23+
- "6379:6379"
24+
environment:
25+
- REDIS_PASSWORD=gaebaljipDev123@@
26+
command: ["redis-server", "--requirepass", "gaebaljipDev123@@"]
27+
networks:
28+
- gaebaljip-network
29+
30+
eatceed-backend:
31+
image: hwangdaesun/gaebaljip-dev:latest
32+
container_name: gaebaljip-spring
33+
ports:
34+
- 8080:8080
35+
depends_on:
36+
- eatceed-mariadb
37+
- eatceed-redis
38+
environment:
39+
- SPRING_DATASOURCE_URL=jdbc:mariadb://gaebaljip-mariadb:3306/gaebaljip?serverTimezone=Asia/Seoul
40+
- SPRING_DATASOURCE_USERNAME=gaebaljip-dev
41+
- SPRING_DATASOURCE_PASSWORD=gaebaljip-dev
42+
- S3_BUCKET_NAME=${S3_BUCKET_NAME}
43+
- CLOUD_AWS_ACCESS_KEY=${CLOUD_AWS_ACCESS_KEY}
44+
- CLOUD_AWS_SECRET_KEY=${CLOUD_AWS_SECRET_KEY}
45+
- JWT_SECRET=${JWT_SECRET}
46+
- SES_MAIL_ADDRESS=${SES_MAIL_ADDRESS}
47+
- ENCRYPTION_SPEC=${ENCRYPTION_SPEC}
48+
- ENCRYPTION_SECRET=${ENCRYPTION_SECRET}
49+
- ENCRYPTION_ALGORITHM=${ENCRYPTION_ALGORITHM}
50+
- REDIS_HOST=gaebaljip-redis
51+
- REDIS_PORT=6379
52+
- REDIS_PASSWORD=${REDIS_PASSWORD}
53+
- SCHEDULER_NUTRITION_CACHE_UPDATE=${SCHEDULER_NUTRITION_CACHE_UPDATE}
54+
- APP_VERSION=${APP_VERSION}
55+
- EXCEED_POLICY_URL=${EXCEED_POLICY_URL}
56+
- EXCEED_CONTACT_EMAIL=${EXCEED_CONTACT_EMAIL}
57+
networks:
58+
- gaebaljip-network
59+
restart: "no"
60+
61+
networks:
62+
gaebaljip-network:

‎docker-compose-monitoring.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
version: '3'
2+
services:
3+
grafana:
4+
image: grafana/grafana:latest
5+
container_name: grafana
6+
restart: always
7+
ports:
8+
- 3000:3000
9+
volumes:
10+
- grafana-data:/var/lib/grafana
11+
- ./resources/gaebaljip-prod-environment/grafana/provisioning/:/etc/grafana/provisioning/
12+
environment:
13+
- GF_SERVER_ROOT_URL=localhost:3000
14+
- GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
15+
depends_on:
16+
- prometheus
17+
networks:
18+
- gaebaljip-network
19+
20+
prometheus:
21+
image: prom/prometheus:latest
22+
container_name: prometheus
23+
restart: always
24+
ports:
25+
- 9090:9090
26+
volumes:
27+
- ./resources/gaebaljip-prod-environment/prometheus/config:/etc/prometheus/
28+
- prometheus-data:/prometheus
29+
command:
30+
- '--config.file=/etc/prometheus/prometheus.yml'
31+
- '--storage.tsdb.path=/prometheus'
32+
networks:
33+
- gaebaljip-network
34+
35+
volumes:
36+
grafana-data:
37+
prometheus-data:
38+
39+
networks:
40+
gaebaljip-network:

‎docker-compose-prod.yml

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,45 +24,11 @@ services:
2424
- REDIS_PASSWORD=${REDIS_PASSWORD}
2525
- SCHEDULER_NUTRITION_CACHE_UPDATE=${SCHEDULER_NUTRITION_CACHE_UPDATE}
2626
- APP_VERSION=${APP_VERSION}
27+
- EXCEED_POLICY_URL=${EXCEED_POLICY_URL}
28+
- EXCEED_CONTACT_EMAIL=${EXCEED_CONTACT_EMAIL}
2729
networks:
2830
- gaebaljip-network
2931
restart: "always"
3032

31-
grafana:
32-
image: grafana/grafana:latest
33-
container_name: grafana
34-
restart: "always"
35-
ports:
36-
- "3000:3000"
37-
volumes:
38-
- grafana-data:/var/lib/grafana
39-
- ./resources/gaebaljip-prod-environment/grafana/provisioning/:/etc/grafana/provisioning/
40-
environment:
41-
- GF_SERVER_ROOT_URL=localhost:3000
42-
- GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
43-
depends_on:
44-
- prometheus
45-
networks:
46-
- gaebaljip-network
47-
48-
prometheus:
49-
image: prom/prometheus:latest
50-
container_name: prometheus
51-
restart: "always"
52-
ports:
53-
- "9090:9090"
54-
volumes:
55-
- ./resources/gaebaljip-prod-environment/prometheus/config:/etc/prometheus/
56-
- prometheus-data:/prometheus
57-
command:
58-
- '--config.file=/etc/prometheus/prometheus.yml'
59-
- '--storage.tsdb.path=/prometheus'
60-
networks:
61-
- gaebaljip-network
62-
63-
volumes:
64-
grafana-data:
65-
prometheus-data:
66-
6733
networks:
6834
gaebaljip-network:

‎docker-compose.yml

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

‎resources/gaebaljip-develop-environment/mariadb-init/00_init.sql

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

‎resources/gaebaljip-develop-environment/mariadb-init/01_schema.sql

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
use gaebaljip;
22

3+
CREATE TABLE `AGREEMENT_TB`
4+
(
5+
`AGREEMENT_PK` bigint(20) NOT NULL AUTO_INCREMENT,
6+
`CREATED_DATE` datetime(6) NOT NULL,
7+
`UPDATED_DATE` datetime(6) NOT NULL,
8+
`AGREEMENT_IS_PRIVACY_POLICY_AGREE` tinyint NOT NULL,
9+
`AGREEMENT_IS_TERMS_SERVICE_AGREE` tinyint NOT NULL,
10+
`AGREEMENT_IS_OVER_AGE` tinyint NOT NULL,
11+
`AGREEMENT_IS_SENSITIVE_DATA_AGREE` tinyint NOT NULL,
12+
PRIMARY KEY (`AGREEMENT_PK`)
13+
) ENGINE=InnoDB;
314

415
CREATE TABLE `MEMBER_TB`
516
(
@@ -18,18 +29,8 @@ CREATE TABLE `MEMBER_TB`
1829
`MEMBER_TARGET_WEIGHT` double DEFAULT NULL,
1930
`MEMBER_CHECKED` bit(1) NOT NULL DEFAULT 0,
2031
`AGREEMENT_FK` bigint(20) NOT NULL,
21-
PRIMARY KEY (`MEMBER_PK`)
22-
) ENGINE=InnoDB;
23-
24-
CREATE TABLE `AGREEMENT_TB`
25-
(
26-
`AGREEMENT_PK` bigint(20) NOT NULL AUTO_INCREMENT,
27-
`CREATED_DATE` datetime(6) NOT NULL,
28-
`UPDATED_DATE` datetime(6) NOT NULL,
29-
`AGREEMENT_IS_PRIVACY_POLICY_AGREE` tinyint NOT NULL,
30-
`AGREEMENT_IS_TERMS_SERVICE_AGREE` tinyint NOT NULL,
31-
`AGREEMENT_IS_OVER_AGE` tinyint NOT NULL,
32-
PRIMARY KEY (`AGREEMENT_PK`)
32+
PRIMARY KEY (`MEMBER_PK`),
33+
FOREIGN KEY (`AGREEMENT_FK`) REFERENCES `AGREEMENT_TB` (`AGREEMENT_PK`)
3334
) ENGINE=InnoDB;
3435

3536
CREATE TABLE `FOOD_TB`

‎resources/gaebaljip-develop-environment/mariadb-init/02_data.sql

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

‎resources/gaebaljip-develop-environment/prometheus/config/prometheus.yml

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

0 commit comments

Comments
 (0)