From e4fe1c0e45219453db09c70d87c6c106eddf0fe4 Mon Sep 17 00:00:00 2001 From: cheon-eunjeong Date: Sat, 18 Nov 2023 20:29:25 +0900 Subject: [PATCH 1/2] =?UTF-8?q?docs:=20README=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 64 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1f6ccc24f..ae90e4121 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,52 @@ -

-


-██████╗  ██████╗ ███╗   ██╗ ██████╗        ██████╗ ██╗     ███████╗
-██╔══██╗██╔═══██╗████╗  ██║██╔════╝       ██╔════╝ ██║     ██╔════╝
-██║  ██║██║   ██║██╔██╗ ██║██║  ███╗█████╗██║  ███╗██║     █████╗  
-██║  ██║██║   ██║██║╚██╗██║██║   ██║╚════╝██║   ██║██║     ██╔══╝  
-██████╔╝╚██████╔╝██║ ╚████║╚██████╔╝      ╚██████╔╝███████╗███████╗
-╚═════╝  ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝        ╚═════╝ ╚══════╝╚══════╝
-
-

-

동글

-

📝같은 글을 한 번에 포스팅하자! 블로그 포스트 관리 툴, 동글✍️

+
+Donggle +
+ +# 동글(Donggle) + + + + + + +## 💡 서비스 소개 +텍스트 에디터에서 글을 작성한 후, 블로그에 올려보신 적 있나요? 🤔 + +그 과정에서 다음 문제점들을 맞닥뜨린 적이 있을 거예요 + +> "복사-붙여넣기 하면 글의 스타일이 깨져요"
"이미지를 업로드할 때 문제가 생겨요"
"글을 어떤 블로그에 올렸는지 계속 확인하게 돼요"
"같은 글을 여러 블로그에 올리기 번거로워요" + +### 이런 문제점들, 모두 **동글**이 해결해 드릴게요! 🎉 + +동글은 다른 텍스트 에디터에서 작성된 글을 **블로그로 포스팅**하고, **관리**할 수 있는 기능을 제공해요. + +이제 텍스트 에디터에서 작성한 글을 블로그로 쉽게 포스팅해보세요! + +
+ + +## 🛠️ 기술 스택 +### 백엔드 +![image](https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/77395d4a-af80-4268-bbf9-1307365a7056) + +
+ +### 프론트엔드 +![image](https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/1840f97f-9ba6-4bf4-ae76-643cfd57b318) + +
+ +### 인프라 +![image](https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/b5f6d953-4b53-4956-9601-7bc664b2413c) + +
+ +## 🌱 서비스 아키텍처 +![image](https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/ebaf551f-8f74-4d2c-af89-950d44a095c6) + +
+ +## 🫶 팀 문화 +image + + From 0674957d1da2985a7f56d794cf5b012e013c297c Mon Sep 17 00:00:00 2001 From: Eun-chan Cho Date: Wed, 22 Nov 2023 16:55:20 +0900 Subject: [PATCH 2/2] =?UTF-8?q?chore:=20GitHub=20Action=20=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A6=BD=ED=8A=B8=EB=A5=BC=20=EC=9D=B4=EC=A0=84?= =?UTF-8?q?=ED=95=9C=20=EC=9D=B8=ED=94=84=EB=9D=BC=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95=20(#612)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: action 스크립트를 이전한 인프라에 맞게 수정 * chore: Submodule 커밋 업데이트 --- .github/workflows/build-be-dev.yml | 2 +- .github/workflows/build-be-prod.yml | 2 +- .github/workflows/build-fe-dev.yml | 2 +- .github/workflows/build-fe-prod.yml | 2 +- .github/workflows/deploy-dev.yml | 2 +- .github/workflows/deploy-prod.yml | 2 +- backend/Dockerfile-dev | 1 - backend/src/main/resources/config | 2 +- compose-blue.yml | 6 ------ compose-green.yml | 6 ------ 10 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-be-dev.yml b/.github/workflows/build-be-dev.yml index 8e57d40d3..c93927234 100644 --- a/.github/workflows/build-be-dev.yml +++ b/.github/workflows/build-be-dev.yml @@ -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 diff --git a/.github/workflows/build-be-prod.yml b/.github/workflows/build-be-prod.yml index a30bcaba7..3810d464b 100644 --- a/.github/workflows/build-be-prod.yml +++ b/.github/workflows/build-be-prod.yml @@ -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 diff --git a/.github/workflows/build-fe-dev.yml b/.github/workflows/build-fe-dev.yml index 10a817a44..ccceac749 100644 --- a/.github/workflows/build-fe-dev.yml +++ b/.github/workflows/build-fe-dev.yml @@ -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 diff --git a/.github/workflows/build-fe-prod.yml b/.github/workflows/build-fe-prod.yml index a9c728181..dea2a1210 100644 --- a/.github/workflows/build-fe-prod.yml +++ b/.github/workflows/build-fe-prod.yml @@ -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 diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 0b1aecdb1..3cc75b8a1 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -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 diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index d4145422a..a08fce594 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -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 diff --git a/backend/Dockerfile-dev b/backend/Dockerfile-dev index 8a2e421f4..6557e72e0 100644 --- a/backend/Dockerfile-dev +++ b/backend/Dockerfile-dev @@ -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"\ diff --git a/backend/src/main/resources/config b/backend/src/main/resources/config index 1872cc111..70c74bb50 160000 --- a/backend/src/main/resources/config +++ b/backend/src/main/resources/config @@ -1 +1 @@ -Subproject commit 1872cc1118c444d27c65450a2085d839a2347a1a +Subproject commit 70c74bb50ce2c854585df15de13a5c7aa5777faa diff --git a/compose-blue.yml b/compose-blue.yml index 3bc5a8254..f79ccd5bd 100644 --- a/compose-blue.yml +++ b/compose-blue.yml @@ -7,7 +7,6 @@ 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 @@ -15,11 +14,6 @@ services: - 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 diff --git a/compose-green.yml b/compose-green.yml index 50c946d78..75c3ff4bf 100644 --- a/compose-green.yml +++ b/compose-green.yml @@ -7,7 +7,6 @@ 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 @@ -15,11 +14,6 @@ services: - 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