Skip to content

Commit

Permalink
Merge pull request #362 from Team-Ampersand/feature/cd-develop-master
Browse files Browse the repository at this point in the history
CD 스크립트 수정
  • Loading branch information
esperar committed Jul 6, 2024
2 parents 7152415 + 4c874ee commit 55500f5
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 47 deletions.
16 changes: 15 additions & 1 deletion .github/workflows/ci.yml → .github/workflows/develop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ on:
pull_request:
branches:
- 'develop'
- 'master'
push:
branches:
- 'develop'

jobs:
build:
Expand Down Expand Up @@ -34,3 +36,15 @@ jobs:

- name: Build with Gradle
run: ./gradlew build

- name: Login Dockerhub
env:
DOCKER_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKERHUB_TOKEN}}
run: docker login -u ${{secrets.DOCKERHUB_USERNAME}} -p ${{secrets.DOCKERHUB_TOKEN}}

- name: Build the Docker image
run: docker build --platform linux/amd64 --build-arg DEPENDENCY=build/dependency -f DockerfileDev -t ${{secrets.DOCKERHUB_USERNAME}}/dotori-dev .

- name: Docker Push
run: docker push ${{secrets.DOCKERHUB_USERNAME}}/dotori-dev
70 changes: 29 additions & 41 deletions .github/workflows/dotori-develop-cd.yml
Original file line number Diff line number Diff line change
@@ -1,63 +1,51 @@
name: Dotori Develop Server CD
name: Java CICD with Gradle

on:
push:
branches: [ develop ]

env:
S3_BUCKET_NAME: dotori-deploy-bucket
PROJECT_NAME: Dotori-V2-Dev
branches:
- 'develop'

jobs:
build:
name: CD
runs-on: ubuntu-latest

runs-on: self-hosted

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'zulu'

- name: Grant execute permission for gradlew
run: chmod +x ./gradlew
shell: bash
distribution: 'temurin'

- name: Create application.yml on dev
- name: Create application.yml
run: |
mkdir ./src/main/resources
touch ./src/main/resources/application.yml
echo "${{ secrets.APPLICATION_YML }}" >> ./src/main/resources/application.yml
shell: bash
echo "${{ secrets.APPLICATION_YML }}" >> ./src/main/resources/application.yml
- name: Create application-dev.yml
run: |
touch ./src/main/resources/application-dev.yml
echo "${{ secrets.APPLICATION_DEV_YML }}" >> ./src/main/resources/application-dev.yml
- name: Grant execute permission for gradlew
run: chmod +x ./gradlew

- name: Build with Gradle
run: ./gradlew build
shell: bash

- name: Make zip file
run: zip -r ./$GITHUB_SHA.zip .
shell: bash

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
username: ${{secrets.DOCKERHUB_USERNAME}}
password: ${{secrets.DOCKERHUB_TOKEN}}

- name: Copy script
run: cp ./deploy-execute.sh ./deploy
- name: Pull Docker image
run: sudo docker pull ${{secrets.DOCKERHUB_USERNAME}}/dotori-dev

- name: Upload to S3
run: aws s3 cp --region ap-northeast-2 ./$GITHUB_SHA.zip s3://$S3_BUCKET_NAME/$PROJECT_NAME/$GITHUB_SHA.zip
- name: Delete Old docker container
run: sudo docker rm -f dotori-dev || true

- name: Deploy
run: |
aws deploy create-deployment \
--application-name dotori-v2 \
--deployment-config-name CodeDeployDefault.OneAtATime \
--deployment-group-name dotori-deploy-group \
--file-exists-behavior OVERWRITE \
--s3-location bucket=dotori-deploy-bucket,bundleType=zip,key=Dotori-V2-Dev/$GITHUB_SHA.zip \
--region ap-northeast-2 \
- name: Run Docker Container
run: sudo docker run -d -p 8080:8080 --name dotori-dev ${{secrets.DOCKERHUB_USERNAME}}/dotori-dev
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: self-hosted

steps:
- uses: actions/checkout@v3
Expand All @@ -20,6 +20,7 @@ jobs:

- name: Create application.yml
run: |
mkdir ./src/main/resources
touch ./src/main/resources/application.yml
echo "${{ secrets.APPLICATION_YML }}" >> ./src/main/resources/application.yml
Expand All @@ -40,8 +41,11 @@ jobs:
username: ${{secrets.DOCKERHUB_USERNAME}}
password: ${{secrets.DOCKERHUB_TOKEN}}

- name: Build the Docker image
run: docker build --platform linux/amd64 --build-arg DEPENDENCY=build/dependency -f DockerfileProd -t ${{secrets.DOCKERHUB_USERNAME}}/dotori-prod .
- name: Pull Docker image
run: sudo docker pull ${{secrets.DOCKERHUB_USERNAME}}/dotori

- name: Docker Push
run: docker push ${{secrets.DOCKERHUB_USERNAME}}/dotori-prod
- name: Delete Old docker container
run: sudo docker rm -f dotori || true

- name: Run Docker Container
run: sudo docker run -d -p 8080:8080 --name dotori ${{secrets.DOCKERHUB_USERNAME}}/dotori
50 changes: 50 additions & 0 deletions .github/workflows/master-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Java CICD with Gradle

on:
pull_request:
branches:
- 'master'
push:
branches:
- 'master'

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'

- name: Create application.yml
run: |
touch ./src/main/resources/application.yml
echo "${{ secrets.APPLICATION_YML }}" >> ./src/main/resources/application.yml
- name: Create application-prod.yml
run: |
touch ./src/main/resources/application-dev.yml
echo "${{ secrets.APPLICATION_PROD_YML }}" >> ./src/main/resources/application-prod.yml
- name: Grant execute permission for gradlew
run: chmod +x ./gradlew

- name: Build with Gradle
run: ./gradlew build

- name: Login Dockerhub
env:
DOCKER_USERNAME: ${{secrets.DOCKERHUB_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKERHUB_TOKEN}}
run: docker login ${{secrets.DOCKERHUB_USERNAME}} -p ${{secrets.DOCKERHUB_TOKEN}}

- name: Build the Docker image
run: docker build --platform linux/amd64 --build-arg DEPENDENCY=build/dependency -f DockerfileProd -t ${{secrets.DOCKERHUB_USERNAME}}/dotori .

- name: Docker Push
run: docker push ${{secrets.DOCKERHUB_USERNAME}}/dotori

0 comments on commit 55500f5

Please sign in to comment.