도커 이미지명 환경에 맞게 생성되도록 수정.

도커 이미지명 환경에 맞게 생성되도록 수정.

Author: midoBanDev

.github/workflows/build-and-push.yaml renamed to .github/workflows/build-and-push.yml

@@ -11,17 +11,13 @@ jobs:
   # 개발 환경
   build-and-push-dev:
     runs-on: ubuntu-latest  
-    if: github.ref == 'refs/heads/dev'
+    #if: github.ref == 'refs/heads/dev'
+    if: 1 == 2
     environment: development
     steps:
     - 
       name: Checkout Repository
       uses: actions/checkout@v4
-    
-    -
-      name: Set up QEMU
-      # 다중 플랫폼(Docker) 이미지를 빌드할 수 있도록 해준다.
-      uses: docker/setup-qemu-action@v3
 
     - 
       name: Set up Docker Buildx
@@ -47,16 +43,14 @@ jobs:
         file: Dockerfile
         build-args: |
           PROFILE=${{ vars.PROFILE }}
-        env:
           POSTGRESQL_POSTGRES_PASSWORD=${{secrets.POSTGRESQL_POSTGRES_PASSWORD}}
           POSTGRES_DB=${{ secrets.POSTGRES_DB }}
           POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
           POSTGRES_USER=${{ secrets.POSTGRES_USER }}
           TZ=${{ vars.TZ }}
           
         push: true  # 이미지를 레지스트리에 푸시합니다.
-        tags: ${{ secrets.DOCKERHUB_USERNAME }}/loan-postgres:${{ github.sha }}  
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        tags: ${{ secrets.DOCKERHUB_USERNAME }}/loan-postgres-dev:${{ github.sha }}  
 
   # 운영 환경
   build-and-push-prod:
@@ -68,11 +62,6 @@ jobs:
       name: Checkout Repository
       uses: actions/checkout@v4
 
-    -
-      name: Set up QEMU
-      # 다중 플랫폼(Docker) 이미지를 빌드할 수 있도록 해준다.
-      uses: docker/setup-qemu-action@v3
-
     - 
       name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3  
@@ -97,13 +86,11 @@ jobs:
         file: Dockerfile
         build-args: |
           PROFILE=${{ vars.PROFILE }}
-        env:
           POSTGRESQL_POSTGRES_PASSWORD=${{ secrets.POSTGRESQL_POSTGRES_PASSWORD }}
           POSTGRES_DB=${{ secrets.POSTGRES_DB }}
           POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
           POSTGRES_USER=${{ secrets.POSTGRES_USER }}
           TZ=${{ vars.TZ }}
           
         push: true  # 이미지를 레지스트리에 푸시합니다.
-        tags: ${{ secrets.DOCKERHUB_USERNAME }}/loan-postgres:${{ github.sha }}          
-        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        tags: ${{ secrets.DOCKERHUB_USERNAME }}/loan-postgres-prod:${{ github.sha }}          

.github/workflows/pull-request.yml

@@ -0,0 +1,49 @@
+name: PR Pipeline
+
+on:
+ pull_request:
+   branches: 
+     - main
+
+jobs:
+  # 개발 환경
+  pull_request_build_test:
+    runs-on: ubuntu-latest  
+    environment: production
+    steps:
+    - 
+      name: Checkout Repository
+      uses: actions/checkout@v4
+
+    - 
+      name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3  
+      # Docker Buildx를 설정합니다.
+
+    - 
+      name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}  
+        # GitHub Secret에서 Docker Hub 사용자 이름을 가져옵니다.
+        password: ${{ secrets.DOCKERHUB_TOKEN }}     
+        # GitHub Secret에서 Docker Hub 액세스 토큰을 가져옵니다.
+
+    - 
+      name: Build and Push
+      uses: docker/build-push-action@v6
+      with:
+        # 빌드 컨텍스트 : Dockerfile이 있는 위치
+        context: .
+        # Dockerfile의 경로
+        file: Dockerfile
+        build-args: |
+          PROFILE=${{ vars.PROFILE }}
+          POSTGRESQL_POSTGRES_PASSWORD=${{secrets.POSTGRESQL_POSTGRES_PASSWORD}}
+          POSTGRES_DB=${{ secrets.POSTGRES_DB }}
+          POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}
+          POSTGRES_USER=${{ secrets.POSTGRES_USER }}
+          TZ=${{ vars.TZ }}
+          
+        push: true  # 이미지를 레지스트리에 푸시합니다.
+        tags: ${{ secrets.DOCKERHUB_USERNAME }}/loan-postgres:${{ github.sha }}  

Dockerfile

@@ -12,11 +12,18 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 # 환경별 변수
-ENV POSTGRESQL_POSTGRES_PASSWORD
-ENV POSTGRES_DB
-ENV POSTGRES_PASSWORD
-ENV POSTGRES_USER
-ENV TZ
+
+ARG POSTGRESQL_POSTGRES_PASSWORD
+ARG POSTGRES_DB
+ARG POSTGRES_PASSWORD
+ARG POSTGRES_USER
+ARG TZ
+
+ENV POSTGRESQL_POSTGRES_PASSWORD=${POSTGRESQL_POSTGRES_PASSWORD}
+ENV POSTGRES_DB=${POSTGRES_DB}
+ENV POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+ENV POSTGRES_USER=${POSTGRES_USER}
+ENV TZ=${TZ}
 
 ARG PROFILE=local
 

README.md

@@ -1,2 +1,5 @@
 # PostgreSQL 인프라 관리 프로젝트
+
+# compose.xml 추가
+
 # Github Acions 추가