Skip to content

Commit 1cd56e1

Browse files
Hju95Hju95
authored
Merge pull request #469 from Kernel360/develop
[merge] develop into main
2 parents 0db091a + 09e8572 commit 1cd56e1

File tree

121 files changed

+370
-7021
lines changed

Some content is hidden

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

121 files changed

+370
-7021
lines changed

‎.github/workflows/cd-dev.yml‎

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ jobs:
2222
distribution: 'temurin'
2323

2424
- name: Set up member-api application.yml
25-
run: echo "${{ secrets.MEMBER_APPLICATION }}" > ./member-api/src/main/resources/application.yml
25+
run: echo "${{ secrets.MEMBER_DEV_APPLICATION }}" > ./member-api/src/main/resources/application.yml
26+
27+
- name: Upload member-api application.yml artifact
2628
uses: actions/upload-artifact@v2
2729
with:
2830
name: application.yml
@@ -45,7 +47,9 @@ jobs:
4547
cloud.aws.credentials.secretKey: ${{ secrets.AWS_ACCESS_SECRET }}
4648

4749
- name: Set up domain-mysql application.yml
48-
run: echo "${{ secrets.APPLICATION }}" > ./domain-mysql/src/main/resources/application.yml
50+
run: echo "${{ secrets.RDB_DEV_APPLICATION }}" > ./domain-mysql/src/main/resources/application.yml
51+
52+
- name: Upload domain-mysql application.yml artifact
4953
uses: actions/upload-artifact@v2
5054
with:
5155
name: application.yml
@@ -65,34 +69,6 @@ jobs:
6569
env:
6670
spring.data.mongodb.uri: ${{ secrets.MONGO_TEST_URI }}
6771

68-
- name: Set up admin-api application.yml
69-
uses: microsoft/variable-substitution@v1
70-
with:
71-
files: ./admin-api/src/main/resources/application.yml
72-
env:
73-
spring.datasource.url: ${{ secrets.LOCAL_DB_URL }}
74-
spring.datasource.username: ${{ secrets.LOCAL_DB_HOST }}
75-
spring.datasource.password: ${{ secrets.LOCAL_DB_PASSWORD }}
76-
spring.security.jwt.secret: ${{ secrets.JWT_SECRET_KEY }}
77-
cloud.aws.s3.bucket: ${{ secrets.S3_BUCKET_NAME }}
78-
cloud.aws.region.static: ${{ secrets.S3_REGION }}
79-
cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
80-
cloud.aws.credentials.secretKey: ${{ secrets.AWS_ACCESS_SECRET }}
81-
custom.domain.image.baseUrl: ${{ secrets.BASE_URL }}
82-
83-
- name: Set up admin-api test application.yml
84-
uses: microsoft/variable-substitution@v1
85-
with:
86-
files: ./admin-api/src/test/resources/application.yml
87-
env:
88-
spring.security.jwt.secret: ${{ secrets.JWT_SECRET_KEY }}
89-
spring.data.mongodb.uri: ${{ secrets.MONGO_TEST_URI }}
90-
custom.domain.image.baseUrl: ${{ secrets.BASE_URL }}
91-
cloud.aws.s3.bucket: ${{ secrets.S3_BUCKET_NAME }}
92-
cloud.aws.region.static: ${{ secrets.S3_REGION }}
93-
cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
94-
cloud.aws.credentials.secretKey: ${{ secrets.AWS_ACCESS_SECRET }}
95-
9672
- name: Build member-api with Gradle
9773
run: |
9874
cd member-api
@@ -105,10 +81,10 @@ jobs:
10581
username: ${{ secrets.DOCKERHUB_USERNAME }}
10682
password: ${{ secrets.DOCKERHUB_TOKEN }}
10783

108-
- name: admin-api Docker Image Build
109-
run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/kernelsquare-dev ./admin-api
84+
- name: member-api Docker Dev Image Build
85+
run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/kernelsquare-dev ./member-api
11086

111-
- name: admin-api DockerHub Push
87+
- name: member-api DockerHub Dev Push
11288
run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/kernelsquare-dev
11389

11490
deploy:
@@ -118,12 +94,11 @@ jobs:
11894
- name: Deploy and Run
11995
uses: appleboy/ssh-action@master
12096
with:
97+
username: ${{ secrets.DEV_SSH_USER }}
12198
host: ${{ secrets.DEV_IP }}
122-
username: ${{ secrets.EC2_USERNAME }}
12399
key: ${{ secrets.DEV_SSH_KEY }}
124100
script: |
125101
sudo docker stop prod1-dev || true
126102
sudo docker rm prod1-dev || true
127103
sudo docker pull ${{ secrets.DOCKERHUB_USERNAME }}/kernelsquare-dev
128-
sudo docker run --name prod1-dev -d -p 8501:8501 ${{ secrets.DOCKERHUB_USERNAME }}/kernelsquare-dev
129-
sudo docker system prune -f
104+
sudo docker-compose up -d

‎.github/workflows/cd.yml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,6 @@ jobs:
3535
java-version: '21'
3636
distribution: 'temurin'
3737

38-
- name: Set up admin-api application.yml
39-
uses: microsoft/variable-substitution@v1
40-
with:
41-
files: ./admin-api/src/main/resources/application.yml
42-
env:
43-
spring.datasource.url: ${{ secrets.LOCAL_DB_URL }}
44-
spring.datasource.username: ${{ secrets.LOCAL_DB_HOST }}
45-
spring.datasource.password: ${{ secrets.LOCAL_DB_PASSWORD }}
46-
spring.security.jwt.secret: ${{ secrets.JWT_SECRET_KEY }}
47-
cloud.aws.s3.bucket: ${{ secrets.S3_BUCKET_NAME }}
48-
cloud.aws.region.static: ${{ secrets.S3_REGION }}
49-
cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
50-
cloud.aws.credentials.secretKey: ${{ secrets.AWS_ACCESS_SECRET }}
51-
custom.domain.image.baseUrl: ${{ secrets.BASE_URL }}
52-
5338
# - name: Set up member-api application.yml
5439
# uses: microsoft/variable-substitution@v1
5540
# with:

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,6 @@ jobs:
2323
java-version: '21'
2424
distribution: 'temurin'
2525

26-
- name: Set up admin-api test application.yml
27-
uses: microsoft/variable-substitution@v1
28-
with:
29-
files: ./admin-api/src/test/resources/application.yml
30-
env:
31-
spring.security.jwt.secret: ${{ secrets.JWT_SECRET_KEY }}
32-
spring.data.mongodb.uri: ${{ secrets.MONGO_TEST_URI }}
33-
custom.domain.image.baseUrl: ${{ secrets.BASE_URL }}
34-
cloud.aws.s3.bucket: ${{ secrets.S3_BUCKET_NAME }}
35-
cloud.aws.region.static: ${{ secrets.S3_REGION }}
36-
cloud.aws.credentials.accessKey: ${{ secrets.AWS_ACCESS_KEY }}
37-
cloud.aws.credentials.secretKey: ${{ secrets.AWS_ACCESS_SECRET }}
38-
3926
- name: Set up domain-mongodb test application.yml
4027
uses: microsoft/variable-substitution@v1
4128
with:

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,8 @@ core/src/main/java/com/kernelsquare/core/compose/data/db/**
1111
src/main/java/com/kernel360/kernelsquare/global/compose/mongo/**
1212

1313
member-api/logs/**
14-
admin-api/logs/**
1514

1615
member-api/member-api/logs/**
17-
admin-api/admin-api/logs/**
18-
19-
member-api/src/main/resources/static/docs/**
2016

2117
### STS ###
2218
.apt_generated

‎admin-api/build.gradle‎

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

‎admin-api/gradle/wrapper/gradle-wrapper.jar‎

-42.4 KB
Binary file not shown.

‎admin-api/gradle/wrapper/gradle-wrapper.properties‎

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

0 commit comments

Comments
 (0)