Merge pull request #131 from ITZipProject/main

fix: action 수정
ITZipProject · Nov 20, 2024 · 50e13da · 50e13da
2 parents 35bafa8 + 05ea6f5
commit 50e13da
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,9 +7,13 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+
+    env:
+      NEXT_PUBLIC_API_URL: ${{ secrets.NEXT_PUBLIC_API_URL }}
 
     steps:
     - uses: actions/checkout@v3
+
     - name: Login Dockerhub
       env:
         DOCKER_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
@@ -19,9 +23,11 @@ jobs:
     - name: make .env
       run: | 
         touch .env
-        echo "${{ secrets.SECRET_ENV}}" > .env
+        echo "NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }}" >> .env
+        echo "${{ secrets.SECRET_ENV}}" >> .env
+    
     - name: Builder the Docker image
-      run: docker build -t ${{secrets.DOCKERHUB_USERNAME}}/ts-react-18-nextjs-14.2 .
+      run: docker build --build-arg NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }} -t ${{secrets.DOCKERHUB_USERNAME}}/ts-react-18-nextjs-14.2 .
 
     - name: taging
       run: docker tag ${{secrets.DOCKERHUB_USERNAME}}/ts-react-18-nextjs-14.2 ${{secrets.DOCKERHUB_USERNAME}}/ts-react-18-nextjs-14.2:latest
@@ -37,7 +43,8 @@ jobs:
         key: ${{ secrets.SSH_KEY }}
         port: 22
         script: |
+          echo "NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }}" > /home/ubuntu/itzip/.env
           docker-compose -f /home/ubuntu/itzip/docker-compose.yml down
           docker-compose -f /home/ubuntu/itzip/docker-compose.yml pull
           docker-compose -f /home/ubuntu/itzip/docker-compose.yml up -d
-          docker system prune -a -f
+          docker system prune -a -f
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,8 @@ WORKDIR /app
 COPY package.json package-lock.json ./
 RUN npm ci
 COPY . .
+ARG NEXT_PUBLIC_API_URL
+ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
 RUN npm run build
 
 # 실행 단계
@@ -12,6 +14,9 @@ WORKDIR /app
 
 ENV NODE_ENV production
 
+ARG NEXT_PUBLIC_API_URL
+ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
+
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -4,8 +4,11 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+      args:
+        - NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
     environment:
       - NODE_ENV=production
+      - NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
     ports:
       - "3000:3000"