Skip to content
This repository has been archived by the owner on Jul 29, 2024. It is now read-only.

chore: GitHub Action 스크립트를 이전한 인프라에 맞게 수정 #612

Merged
merged 2 commits into from
Nov 22, 2023
Merged

chore: GitHub Action 스크립트를 이전한 인프라에 맞게 수정 #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9843c9
chore: action 스크립트를 이전한 인프라에 맞게 수정
Nov 22, 2023
dcef36b
chore: Submodule 커밋 업데이트
Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-be-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
file: ./backend/Dockerfile-dev
push: true
tags: ${{ secrets.DOCKER_USERNAME }}/dong-gle-backend-dev:latest
platforms: linux/arm64
platforms: linux/amd64

deploy:
needs: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-be-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ jobs:
file: ./backend/Dockerfile-prod
push: true
tags: ${{ secrets.DOCKER_USERNAME }}/dong-gle-backend-prod:latest
platforms: linux/arm64
platforms: linux/amd64
2 changes: 1 addition & 1 deletion .github/workflows/build-fe-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
file: ${{ vars.FE_DIRECTORY }}/Dockerfile
push: true
tags: ${{ secrets.DOCKER_USERNAME }}/dong-gle-frontend-dev:latest
platforms: linux/arm64
platforms: linux/amd64

deploy:
needs: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-fe-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ jobs:
file: ${{ vars.FE_DIRECTORY }}/Dockerfile
push: true
tags: ${{ secrets.DOCKER_USERNAME }}/dong-gle-frontend-prod:latest
platforms: linux/arm64
platforms: linux/amd64
2 changes: 1 addition & 1 deletion .github/workflows/deploy-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ permissions:

jobs:
deploy:
runs-on: [self-hosted, dev]
runs-on: [self-hosted, donggle-dev]
steps:
- uses: actions/checkout@v3
- name: create .env
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
secrets: inherit

deploy:
runs-on: [self-hosted, prod]
runs-on: [self-hosted, donggle-prod]
needs: [fe-build, be-build]
steps:
- uses: actions/checkout@v3
Expand Down
1 change: 0 additions & 1 deletion backend/Dockerfile-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ EXPOSE 8080
COPY ./build/libs/backend-0.0.1-SNAPSHOT.jar /app.jar
ENTRYPOINT [ \
"java",\
"-javaagent:/javaagent/dd-java-agent.jar",\
"-jar",\
"-Duser.timezone=Asia/Seoul",\
"app.jar"\
Expand Down
2 changes: 1 addition & 1 deletion backend/src/main/resources/config
Open in desktop
Submodule config updated from 1872cc to 70c74b
6 changes: 0 additions & 6 deletions compose-blue.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,13 @@ services:
image: ${DOCKER_USERNAME}/dong-gle-backend-${INFRA_PROFILE}
volumes:
- /home/ubuntu/logs/:/logs/
- /home/ubuntu/javaagent/:/javaagent/
environment:
- HIKARI_MAX_POOL_SIZE
- HIKARI_MIN_IDLE
- TOMCAT_MAX_THREADS
- TOMCAT_ACCEPT_COUNT
- TOMCAT_MAX_CONNECTIONS
- SPRING_PROFILES_ACTIVE
- DD_ENV=dev
- DD_SERVICE=Backend
- DD_AGENT_HOST=datadog-agent
- DD_TRACE_AGENT_PORT=8126
- DD_LOGS_INJECTION=true
networks:
default:
name: donggle-network
Expand Down
6 changes: 0 additions & 6 deletions compose-green.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,13 @@ services:
image: ${DOCKER_USERNAME}/dong-gle-backend-${INFRA_PROFILE}
volumes:
- /home/ubuntu/logs/:/logs/
- /home/ubuntu/javaagent/:/javaagent/
environment:
- HIKARI_MAX_POOL_SIZE
- HIKARI_MIN_IDLE
- TOMCAT_MAX_THREADS
- TOMCAT_ACCEPT_COUNT
- TOMCAT_MAX_CONNECTIONS
- SPRING_PROFILES_ACTIVE
- DD_ENV=dev
- DD_SERVICE=Backend
- DD_AGENT_HOST=datadog-agent
- DD_TRACE_AGENT_PORT=8126
- DD_LOGS_INJECTION=true
networks:
default:
name: donggle-network
Expand Down
Loading