Merge remote-tracking branch 'origin/develop' into develop

.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

.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

.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

.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

.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

.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

README.md

@@ -1,12 +1,52 @@
-<p align="middle" >
-<div align="middle"><pre><code>
-██████╗  ██████╗ ███╗   ██╗ ██████╗        ██████╗ ██╗     ███████╗
-██╔══██╗██╔═══██╗████╗  ██║██╔════╝       ██╔════╝ ██║     ██╔════╝
-██║  ██║██║   ██║██╔██╗ ██║██║  ███╗█████╗██║  ███╗██║     █████╗  
-██║  ██║██║   ██║██║╚██╗██║██║   ██║╚════╝██║   ██║██║     ██╔══╝  
-██████╔╝╚██████╔╝██║ ╚████║╚██████╔╝      ╚██████╔╝███████╗███████╗
-╚═════╝  ╚═════╝ ╚═╝  ╚═══╝ ╚═════╝        ╚═════╝ ╚══════╝╚══════╝
-</code></pre></div>
-</p>
-<h1 align="middle">동글</h1>
-<p align="middle">📝같은 글을 한 번에 포스팅하자! 블로그 포스트 관리 툴, 동글✍️</p>
+<div align="middle">
+<img width="800" alt="Donggle" src="https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/c65fd8c8-416a-4a88-852f-a32c5804233a">
+</div>
+
+# 동글(Donggle)
+
+<a href="https://donggle.blog"/><img src="https://img.shields.io/badge/💡-Donggle_Service-EEEEEE?style=square"/></a>
+<a href="https://sites.google.com/woowahan.com/woowacourse-demo-5th/%ED%94%84%EB%A1%9C%EC%A0%9D%ED%8A%B8/%EB%8F%99%EA%B8%80"/><img src="https://img.shields.io/badge/🔗-Demo_Page-EEEEEE?style=square"/></a>
+<a href="https://github.com/woowacourse-teams/2023-dong-gle"/><img src="https://img.shields.io/badge/Team_Repository-000000?style=square&logo=GitHub&logoColor=white"/></a>
+<a href="https://medium.com/dong-gle"/><img src="https://img.shields.io/badge/Team_Blog-000000?style=square&logo=Medium&logoColor=white"/></a>
+
+## 💡 서비스 소개
+텍스트 에디터에서 글을 작성한 후, 블로그에 올려보신 적 있나요? 🤔
+
+그 과정에서 다음 문제점들을 맞닥뜨린 적이 있을 거예요
+
+> "복사-붙여넣기 하면 글의 스타일이 깨져요" <br> "이미지를 업로드할 때 문제가 생겨요" <br> "글을 어떤 블로그에 올렸는지 계속 확인하게 돼요" <br> "같은 글을 여러 블로그에 올리기 번거로워요"
+
+### 이런 문제점들, 모두 **동글**이 해결해 드릴게요! 🎉
+
+동글은 다른 텍스트 에디터에서 작성된 글을 **블로그로 포스팅**하고, **관리**할 수 있는 기능을 제공해요.
+
+이제 텍스트 에디터에서 작성한 글을 블로그로 쉽게 포스팅해보세요!
+
+<br>
+
+
+## 🛠️ 기술 스택
+### 백엔드
+![image](https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/77395d4a-af80-4268-bbf9-1307365a7056)
+
+<br>
+
+### 프론트엔드
+![image](https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/1840f97f-9ba6-4bf4-ae76-643cfd57b318)
+
+<br>
+
+### 인프라
+![image](https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/b5f6d953-4b53-4956-9601-7bc664b2413c)
+
+<br>
+
+## 🌱 서비스 아키텍처
+![image](https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/ebaf551f-8f74-4d2c-af89-950d44a095c6)
+
+<br>
+
+## 🫶 팀 문화
+<img width="1000" alt="image" src="https://github.com/woowacourse-teams/2023-dong-gle/assets/50096374/cc64769c-6046-47c7-a444-3126628e4189">
+
+

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"\

compose-blue.yml

@@ -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

compose-green.yml

@@ -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