Skip to content

Commit

Permalink
Merge pull request #154 from TEAM-SAMSION/main
Browse files Browse the repository at this point in the history
release : 1.0.0 배포
  • Loading branch information
tlarbals824 authored Nov 26, 2023
2 parents db498bc + f463d77 commit 6e50459
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/CD-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,19 @@ jobs:
- name: make promtail-prod.yaml
uses: appleboy/scp-action@master
with:
host: ${{ secrets.HOST }}
host: ${{ secrets.PROD_HOST }}
username: ubuntu
key: ${{ secrets.KEY }}
key: ${{ secrets.PROD_KEY }}
source: "./.deploy/promtail-prod.yaml"
target: "/home/ubuntu"
strip_components: 2

- name: Set .env for configuration
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
host: ${{ secrets.PROD_HOST }}
username: ubuntu
key: ${{ secrets.KEY }}
key: ${{ secrets.PROD_KEY }}
script: |
rm -rf ./.env
touch ./.env
Expand Down Expand Up @@ -88,29 +88,29 @@ jobs:
- name: deploy docker-compose push
uses: appleboy/scp-action@master
with:
host: ${{ secrets.HOST }}
host: ${{ secrets.PROD_HOST }}
username: ubuntu
key: ${{ secrets.KEY }}
key: ${{ secrets.PROD_KEY }}
source: "./.deploy/docker-compose.yml"
target: "/home/ubuntu"
strip_components: 2

- name: deploy docker-compose-dev push
uses: appleboy/scp-action@master
with:
host: ${{ secrets.HOST }}
host: ${{ secrets.PROD_HOST }}
username: ubuntu
key: ${{ secrets.KEY }}
key: ${{ secrets.PROD_KEY }}
source: "./.deploy/docker-compose-prod.yml"
target: "/home/ubuntu"
strip_components: 2

- name: Deploy
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
host: ${{ secrets.PROD_HOST }}
username: ubuntu
key: ${{ secrets.KEY }}
key: ${{ secrets.PROD_KEY }}
script: |
docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPOSITORY }}
docker stop ${{ secrets.DOCKER_REPOSITORY }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/Nginx-CD-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,29 @@ jobs:
- name: nginx.conf push
uses: appleboy/scp-action@master
with:
host: ${{ secrets.HOST }}
host: ${{ secrets.PROD_HOST }}
username: ubuntu
key: ${{ secrets.KEY }}
key: ${{ secrets.PROD_KEY }}
source: "./.deploy/nginx/conf-prod/nginx.conf"
target: "/home/ubuntu/nginx/conf"
strip_components: 4

- name: docker-compose-nginx push
uses: appleboy/scp-action@master
with:
host: ${{ secrets.HOST }}
host: ${{ secrets.PROD_HOST }}
username: ubuntu
key: ${{ secrets.KEY }}
key: ${{ secrets.PROD_KEY }}
source: "./.deploy/nginx/docker-compose.yml"
target: "/home/ubuntu/nginx"
strip_components: 3

- name: Deploy
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
host: ${{ secrets.PROD_HOST }}
username: ubuntu
key: ${{ secrets.KEY }}
key: ${{ secrets.PROD_KEY }}
script: |
cd nginx
docker-compose up -d
Expand Down
2 changes: 1 addition & 1 deletion Api-Module/src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<fileNamePattern> .\logs\logback\logback-%d{yyyy-MM-dd}_%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<!-- or whenever the file size reaches 100MB -->
<maxFileSize>100MB</maxFileSize>
<maxFileSize>50MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
Expand Down

0 comments on commit 6e50459

Please sign in to comment.