From 426b7281b1e3f2ae4c2be8544bc02362ec6f8435 Mon Sep 17 00:00:00 2001 From: midoBanDev Date: Fri, 17 Jan 2025 19:28:59 +0900 Subject: [PATCH 1/5] =?UTF-8?q?github=20actions=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=A7=84=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 54907fe..5f8a710 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ # PostgreSQL 인프라 관리 프로젝트 + +# compose.xml 추가 + # Github Acions 추가 \ No newline at end of file From b7449bfe5e37873e62382b7741d3f06da77aa3db Mon Sep 17 00:00:00 2001 From: midoBanDev Date: Fri, 17 Jan 2025 19:41:17 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EB=8F=84=EC=BB=A4=ED=8C=8C=EC=9D=BC=20ENV?= =?UTF-8?q?=20=ED=99=98=EA=B2=BD=20=EB=B3=80=EC=88=98=20=EC=84=A0=EC=96=B8?= =?UTF-8?q?=20=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2252a7..915b618 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,11 @@ 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 +ENV POSTGRESQL_POSTGRES_PASSWORD="" +ENV POSTGRES_DB="" +ENV POSTGRES_PASSWORD="" +ENV POSTGRES_USER="" +ENV TZ="" ARG PROFILE=local From d8f2d8e9118ef374ee1fa7c9a1998e02a6339a7b Mon Sep 17 00:00:00 2001 From: midoBanDev Date: Fri, 17 Jan 2025 19:50:45 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EB=8F=84=EC=BB=A4=20=ED=99=98=EA=B2=BD=20?= =?UTF-8?q?=EB=B3=80=EC=88=98=20=EC=A0=81=EC=9A=A9=20=EB=B0=A9=EC=8B=9D=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 915b618..7973d99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,11 @@ 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="" +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 From 611a357cb2d0688c5eb0bf9e1c60662ec9648f1d Mon Sep 17 00:00:00 2001 From: midoBanDev Date: Fri, 17 Jan 2025 20:10:59 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EB=8F=84=EC=BB=A4=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EB=B0=8F=20=EC=9B=8C=ED=81=AC=ED=94=8C=EB=A1=9C=EC=9A=B0=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98=20=EC=9E=91=EC=84=B1=20?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-and-push.yaml | 2 -- Dockerfile | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index 48cb40d..407058f 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -47,7 +47,6 @@ 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 }} @@ -97,7 +96,6 @@ 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 }} diff --git a/Dockerfile b/Dockerfile index 7973d99..05f8f90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,13 @@ RUN apt-get update && apt-get install -y \ && rm -rf /var/lib/apt/lists/* # 환경별 변수 + +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} From 8df5027de0f337f0258bdb75d67150312104735c Mon Sep 17 00:00:00 2001 From: midoBanDev Date: Mon, 20 Jan 2025 15:36:30 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EB=8F=84=EC=BB=A4=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EB=AA=85=20=ED=99=98=EA=B2=BD=EC=97=90=20=EB=A7=9E?= =?UTF-8?q?=EA=B2=8C=20=EC=83=9D=EC=84=B1=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...build-and-push.yaml => build-and-push.yml} | 19 ++----- .github/workflows/pull-request.yml | 49 +++++++++++++++++++ 2 files changed, 53 insertions(+), 15 deletions(-) rename .github/workflows/{build-and-push.yaml => build-and-push.yml} (81%) create mode 100644 .github/workflows/pull-request.yml diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yml similarity index 81% rename from .github/workflows/build-and-push.yaml rename to .github/workflows/build-and-push.yml index 407058f..6d641b5 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.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 @@ -54,8 +50,7 @@ jobs: 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: @@ -67,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 @@ -103,5 +93,4 @@ jobs: TZ=${{ vars.TZ }} push: true # 이미지를 레지스트리에 푸시합니다. - tags: ${{ secrets.DOCKERHUB_USERNAME }}/loan-postgres:${{ github.sha }} - platforms: linux/amd64,linux/arm64,linux/arm/v7 \ No newline at end of file + tags: ${{ secrets.DOCKERHUB_USERNAME }}/loan-postgres-prod:${{ github.sha }} \ No newline at end of file diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml new file mode 100644 index 0000000..46e8bcc --- /dev/null +++ b/.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 }} \ No newline at end of file