diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index df4b1f5e..5cc92f50 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -1,11 +1,9 @@ # github repository actions 페이지에 나타날 이름 name: CD for front using github actions -# event trigger -# develop 브랜치에 pull_request가 닫히거나 푸시했을때 실행 on: - push: - branches: [ "develop" ] + release: + types: [created] permissions: contents: read @@ -31,6 +29,10 @@ jobs: - name: Build with npm run: npm run build-only + - name: Create nginxfile.conf + run: touch ./nginxfile.conf + - run: echo "${{ secrets.NGINX_FILE_CONF }}" > ./nginxfile.conf + - name: Create nginx.conf run: touch ./nginx.conf - run: echo "${{ secrets.NGINX_CONF }}" > ./nginx.conf diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index c3aa7b09..5fbfc205 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -6,7 +6,7 @@ name: CI for front using github actions on: pull_request: types: [ opened, synchronize ] - branches: [ "develop" ] + branches: [ "release" ] permissions: contents: read diff --git a/.github/workflows/create-jira-bug-issue.yml b/.github/workflows/create-jira-bug-issue.yml index 68f0f1a8..4adcadee 100644 --- a/.github/workflows/create-jira-bug-issue.yml +++ b/.github/workflows/create-jira-bug-issue.yml @@ -74,10 +74,10 @@ jobs: - name: Log created issue run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created" - - name: Checkout develop code + - name: Checkout release code uses: actions/checkout@v4 with: - ref: develop + ref: release token: ${{ secrets.PAT_TOKEN }} - name: Create branch with Ticket number diff --git a/Dockerfile b/Dockerfile index fa62b06b..f7f98562 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ FROM nginx +COPY nginxfile.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/conf.d/default.conf COPY dist/. /usr/share/nginx/html/ CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file