Merge pull request #130 from jooyong-boo/develop

merge develop
jooyong-boo · Sep 19, 2024 · a12859e · a12859e
2 parents 7168f49 + eb1847d
commit a12859e
Show file tree

Hide file tree

Showing 18 changed files with 1,484 additions and 37 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -5,7 +5,6 @@ on:
     branches: ['main']
 
 env:
-  AWS_REGION: ap-northeast-2
   ECR_REPOSITORY: devlog
   IMAGE_TAG: ${{ github.sha }}
   URL: ${{ secrets.URL }}
@@ -16,6 +15,10 @@ env:
   AUTH_SECRET: ${{ secrets.AUTH_SECRET }}
   AUTH_URL: ${{ secrets.AUTH_URL }}
   DATABASE_URL: ${{ secrets.DATABASE_URL }}
+  AWS_REGION: ${{ secrets.AWS_REGION }}
+  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+  AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
 
 jobs:
   deploy:
@@ -68,6 +71,10 @@ jobs:
               --build-arg AUTH_SECRET="${{ secrets.AUTH_SECRET }}" \
               --build-arg AUTH_URL="${{ secrets.AUTH_URL }}" \
               --build-arg DATABASE_URL="${{ secrets.DATABASE_URL }}" \
+              --build-arg AWS_S3_BUCKET="${{ secrets.AWS_S3_BUCKET }}" \
+              --build-arg AWS_REGION="${{ secrets.AWS_REGION }}" \
+              --build-arg AWS_ACCESS_KEY_ID="${{ secrets.AWS_ACCESS_KEY_ID }}" \
+              --build-arg AWS_SECRET_ACCESS_KEY="${{ secrets.AWS_SECRET_ACCESS_KEY }}" \
               -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
            docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
            echo "image=$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> $GITHUB_OUTPUT

diff --git a/Dockerfile b/Dockerfile
@@ -8,6 +8,10 @@ ARG GOOGLE_SECRET
 ARG AUTH_SECRET
 ARG AUTH_URL
 ARG DATABASE_URL
+ARG AWS_ACCESS_KEY_ID
+ARG AWS_SECRET_ACCESS_KEY
+ARG AWS_REGION
+ARG AWS_S3_BUCKET
 # 환경 변수 설정
 ENV URL=$URL
 ENV OAUTH_GITHUB_ID=$OAUTH_GITHUB_ID
@@ -17,6 +21,10 @@ ENV GOOGLE_SECRET=$GOOGLE_SECRET
 ENV AUTH_SECRET=$AUTH_SECRET
 ENV AUTH_URL=$AUTH_URL
 ENV DATABASE_URL=$DATABASE_URL
+ENV AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+ENV AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
+ENV AWS_REGION=$AWS_REGION
+ENV AWS_S3_BUCKET=$AWS_S3_BUCKET
 
 FROM base AS deps
 RUN apk add --no-cache libc6-compat

diff --git a/next.config.mjs b/next.config.mjs
@@ -24,6 +24,9 @@ const nextConfig = {
       {
         hostname: 'placehold.co',
       },
+      {
+        hostname: 'devlog-local.s3.ap-northeast-2.amazonaws.com',
+      },
     ],
   },
 };

diff --git a/package.json b/package.json
@@ -14,6 +14,8 @@
   },
   "dependencies": {
     "@auth/prisma-adapter": "^2.4.2",
+    "@aws-sdk/client-s3": "^3.651.0",
+    "@aws-sdk/s3-request-presigner": "^3.651.0",
     "@prisma/client": "5.17.0",
     "@svgr/webpack": "^8.1.0",
     "@tiptap/extension-code-block": "^2.6.5",
@@ -30,6 +32,7 @@
     "cookies-next": "^4.2.1",
     "dompurify": "^3.1.6",
     "highlight.js": "^11.10.0",
+    "html-react-parser": "^5.1.16",
     "jsdom": "^24.1.1",
     "lodash-es": "^4.17.21",
     "lowlight": "^3.1.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,9 @@ const nextConfig = { @@
           {
             hostname: 'placehold.co',
           },
+          {
+            hostname: 'devlog-local.s3.ap-northeast-2.amazonaws.com',
+          },
         ],
       },
     };
@@ Expand Down @@