From a683a5e94f5630e95edb1fe0d726f1b6199236c8 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Tue, 23 Jan 2024 17:18:21 +0900 Subject: [PATCH 01/28] [update] docker-compose.yml grafana section --- docker-compose.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 69b3db7..17edc94 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,10 +30,8 @@ services: - 3000:3000 volumes: - grafana-data:/var/lib/grafana - environment: - - GF_SECURITY_ADMIN_USER=admin # grafana 사용자 이름 - - GF_SECURITY_ADMIN_PASSWORD=admin # grafana 사용자 비밀번호 - - GF_USERS_ALLOW_SIGN_UP=false + env_file: + - .env networks: - app-tier From 3ec2fa220123d1b77ad4c3d2d411dc97989a00f2 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Thu, 25 Jan 2024 15:34:15 +0900 Subject: [PATCH 02/28] [feat] created cd.yml and ci.yml --- .github/workflows/cd.yml | 29 +++++++++++++++ .github/workflows/ci.yml | 79 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 .github/workflows/cd.yml create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml new file mode 100644 index 0000000..4a795c7 --- /dev/null +++ b/.github/workflows/cd.yml @@ -0,0 +1,29 @@ +name: Django CD # workflow 이름 +on: # Event + pull_request: + types: + - closed + branches: [ main ] + +jobs: # Job + cd: # Job 이름 + if: github.event.pull_request.merged == true # Job 실행 조건 + + runs-on: ubuntu-latest # Runner + + steps: # Step + + # ssh를 통해 EC2에 접속, 접속한 후에 실행할 스크립트 작성 + - name: Connect to EC2 using SSH + uses: appleboy/ssh-action@master + with: + host: ${{secrets.AWS_HOST}} + username: ${{secrets.AWS_USERNAME}} + key: ${{ secrets.AWS_KEY_PEM }} + envs: GITHUB_SHA + script: | + cd docker + git pull + sudo docker-compose down + sudo docker-compose pull + sudo docker-compose up -d --build \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..20a7266 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,79 @@ +name: Django CI # workflow 이름 + +on: # Event + push: + branches: + - main + pull_request: + branches: + - main + +jobs: # Job + ci: # Job 이름 + runs-on: ubuntu-latest # Runner + + services: # 컨테이너, docker-compose 설정과 거의 유사 + db: + image: mysql:latest + env: + MYSQL_ROOT_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }} # github에 등록한 환경변수 + MYSQL_DATABASE: ${{ secrets.MYSQL_DATABASE }} + ports: + - 3306:3306 + options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3 + + steps: # Step + # 레포지토리의 소스 코드를 체크아웃하여 작업 디렉토리로 가져오는 action + - name: Checkout + uses: actions/checkout@v2 + + # mysql 컨테이너 연결 확인 + - name: Verify MySQL connection + run: | + mysql --version + mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.DB_USER }} -p ${{ secrets.DB_PASSWORD }} + + # 파이썬 3.11.0 버전 설치 + - name: Set up Python 3.11.0 + uses: actions/setup-python@v2 + with: + python-version: 3.11.0 + + # .env 생성 + - name: Setting .env + run: | + echo "${{ secrets.ENV }}" >> .env + cat .env + + # 의존성 설치 + - name: Install Dependencies + run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + + # mysql 컨테이너에 migration, 테이블 생성 + - name: Run migrations + env: + SECRET_KEY: ${{ secrets.SECRET_KEY }} + DB_NAME: ${{ secrets.DB_NAME }} + DB_USER: ${{ secrets.DB_USER }} + DB_PASSWORD: ${{ secrets.DB_PASSWORD }} + DB_HOST: ${{ secrets.DB_HOST }} + DB_PORT: ${{ secrets.DB_PORT }} + + run: | + python manage.py makemigrations + python manage.py migrate + + # 테스트 진행 + - name: Run Tests + env: + SECRET_KEY: ${{ secrets.SECRET_KEY }} + DB_NAME: ${{ secrets.DB_NAME }} + DB_USER: ${{ secrets.DB_USER }} + DB_PASSWORD: ${{ secrets.DB_PASSWORD }} + DB_HOST: ${{ secrets.DB_HOST }} + DB_PORT: ${{ secrets.DB_PORT }} + run: | + mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.DB_USER }} -p ${{ secrets.DB_PASSWORD }} + python manage.py test --settings=config.settings.test \ No newline at end of file From 5698ffe0d018390a383700f199a071c2dd49282b Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Thu, 25 Jan 2024 15:50:21 +0900 Subject: [PATCH 03/28] [update] ci.yml change --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20a7266..6272aa0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.DB_USER }} -p ${{ secrets.DB_PASSWORD }} + mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.MYSQL_USER }} -p '${{ secrets.MYSQL_PASSWORD }}' # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From a106e5a98d7c210cc32db0bf08d5516c7bc2c944 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Thu, 25 Jan 2024 16:04:52 +0900 Subject: [PATCH 04/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6272aa0..682dd68 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.MYSQL_USER }} -p '${{ secrets.MYSQL_PASSWORD }}' + mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.MYSQL_USER }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From 478a75c5350f4d9ddefee64fcbe3af9290a66498 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Thu, 25 Jan 2024 17:09:38 +0900 Subject: [PATCH 05/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 682dd68..2fc4356 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.MYSQL_USER }} + mysql --host 'mysqldb' --port 3306 -u ${{ secrets.MYSQL_USER }} -p ${{ secrets.MYSQL_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From deedbc2bb137fd6b0ad87795450578daad2e8ff7 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Thu, 25 Jan 2024 17:12:18 +0900 Subject: [PATCH 06/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fc4356..5190f6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host 'mysqldb' --port 3306 -u ${{ secrets.MYSQL_USER }} -p ${{ secrets.MYSQL_PASSWORD }} + mysql --host mysqldb --port 3306 -u ${{ secrets.MYSQL_USER }} -p ${{ secrets.MYSQL_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From bd8029b9ed58e7c8c7095a0bfc060f3b10c5d1ab Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 15:13:38 +0900 Subject: [PATCH 07/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5190f6f..9c3831c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host mysqldb --port 3306 -u ${{ secrets.MYSQL_USER }} -p ${{ secrets.MYSQL_PASSWORD }} + mysql --host 127.0.0.1 --port 3306 # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From 5031afd91760f02a7a1208b13f246c7a3ed261d2 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 15:33:09 +0900 Subject: [PATCH 08/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c3831c..c25b872 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host 127.0.0.1 --port 3306 + mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From 2a31684678279ff73ba17c3998f3730240132c4a Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 15:38:42 +0900 Subject: [PATCH 09/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c25b872..032ea04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} + mysql --host mysqldb --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From 5eb4894ed87d1c159ad71af16d1036bafe0e0cae Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 15:40:20 +0900 Subject: [PATCH 10/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 032ea04..60a154c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host mysqldb --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} + mysql --host mysql --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From e921484570eabce0941aaec5395f8d146e987510 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 16:01:44 +0900 Subject: [PATCH 11/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60a154c..c25b872 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host mysql --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} + mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From a03f0049c2790e9cd8e26757cfa4fc4a440d9cd7 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 16:04:22 +0900 Subject: [PATCH 12/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c25b872..c0bd25d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} + mysql --host % --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From bd9ed2e86650feea3b6aaedfff80d0bad4b70f85 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 16:24:21 +0900 Subject: [PATCH 13/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c0bd25d..032ea04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host % --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} + mysql --host mysqldb --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From 8a09639b0df103b38a1849549bd076f386df38b5 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 17:20:32 +0900 Subject: [PATCH 14/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 032ea04..21c5dbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: # Job - name: Verify MySQL connection run: | mysql --version - mysql --host mysqldb --port 3306 -u ${{ secrets.MYSQL_USER }} -p${{ secrets.MYSQL_PASSWORD }} + mysql --host 127.0.0.1 --port 3306 -u root -p${{ secrets.MYSQL_ROOT_PASSWORD }} # 파이썬 3.11.0 버전 설치 - name: Set up Python 3.11.0 From c6030ab7a6c479cb0538e7bf061c2184809bd053 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 17:24:46 +0900 Subject: [PATCH 15/28] [update] ci.yml --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21c5dbd..1ac982a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,7 @@ jobs: # Job # 의존성 설치 - name: Install Dependencies run: | + cd backend python -m pip install --upgrade pip pip install -r requirements.txt @@ -62,6 +63,7 @@ jobs: # Job DB_PORT: ${{ secrets.DB_PORT }} run: | + cd backend python manage.py makemigrations python manage.py migrate @@ -75,5 +77,6 @@ jobs: # Job DB_HOST: ${{ secrets.DB_HOST }} DB_PORT: ${{ secrets.DB_PORT }} run: | + cd backend mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.DB_USER }} -p ${{ secrets.DB_PASSWORD }} - python manage.py test --settings=config.settings.test \ No newline at end of file + python manage.py test \ No newline at end of file From c95c78abf82bef4bffbfa096482c1909e84f69ca Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 17:29:01 +0900 Subject: [PATCH 16/28] [update] ci.yml --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ac982a..84bdd9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,7 @@ jobs: # Job - name: Install Dependencies run: | cd backend + pwd python -m pip install --upgrade pip pip install -r requirements.txt From 5eb16906e69f0128d26c916bb6024639689ba9f1 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 17:31:21 +0900 Subject: [PATCH 17/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84bdd9f..6577903 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,7 +48,7 @@ jobs: # Job # 의존성 설치 - name: Install Dependencies run: | - cd backend + cd /home/runner/work/docker/backend pwd python -m pip install --upgrade pip pip install -r requirements.txt From c7a36b60ab374d8b88af68e58a78991d413cdb47 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 17:35:33 +0900 Subject: [PATCH 18/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6577903..3e9cae6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,8 +48,8 @@ jobs: # Job # 의존성 설치 - name: Install Dependencies run: | - cd /home/runner/work/docker/backend pwd + cd backend python -m pip install --upgrade pip pip install -r requirements.txt From ae227050f8bef422f70639cd389a65f04fe5e09a Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Fri, 26 Jan 2024 17:38:13 +0900 Subject: [PATCH 19/28] [update] ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e9cae6..ac88d7f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,8 @@ jobs: # Job run: | pwd cd backend + pwd + ls python -m pip install --upgrade pip pip install -r requirements.txt From ff2064f052226df71e9c607e451bd624e7e450e7 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sat, 27 Jan 2024 15:55:16 +0900 Subject: [PATCH 20/28] [update] ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac88d7f..bdeb460 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,9 @@ jobs: # Job # 레포지토리의 소스 코드를 체크아웃하여 작업 디렉토리로 가져오는 action - name: Checkout uses: actions/checkout@v2 + with: + submodules: true # 서브모듈 체크아웃 추가 + # mysql 컨테이너 연결 확인 - name: Verify MySQL connection @@ -48,10 +51,7 @@ jobs: # Job # 의존성 설치 - name: Install Dependencies run: | - pwd cd backend - pwd - ls python -m pip install --upgrade pip pip install -r requirements.txt From df26019c010914def9e606bf0e14ed4fa1a8cb74 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sat, 27 Jan 2024 16:00:18 +0900 Subject: [PATCH 21/28] [update] ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bdeb460..2c12253 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,9 +60,9 @@ jobs: # Job env: SECRET_KEY: ${{ secrets.SECRET_KEY }} DB_NAME: ${{ secrets.DB_NAME }} - DB_USER: ${{ secrets.DB_USER }} + DB_USER: root DB_PASSWORD: ${{ secrets.DB_PASSWORD }} - DB_HOST: ${{ secrets.DB_HOST }} + DB_HOST: 127.0.0.1 DB_PORT: ${{ secrets.DB_PORT }} run: | From 96d14b21fa45b7114e1728d25a8aa985e7084443 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sat, 27 Jan 2024 16:03:52 +0900 Subject: [PATCH 22/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c12253..413b071 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: # Job SECRET_KEY: ${{ secrets.SECRET_KEY }} DB_NAME: ${{ secrets.DB_NAME }} DB_USER: root - DB_PASSWORD: ${{ secrets.DB_PASSWORD }} + DB_PASSWORD: '${{ secrets.DB_PASSWORD }}' DB_HOST: 127.0.0.1 DB_PORT: ${{ secrets.DB_PORT }} From d6944a8d98fdbfe5011dc4b9e20d26fabf305a9b Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sat, 27 Jan 2024 16:07:43 +0900 Subject: [PATCH 23/28] [update] ci.yml --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 413b071..99f15a6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,6 @@ jobs: # Job DB_PORT: ${{ secrets.DB_PORT }} run: | - cd backend python manage.py makemigrations python manage.py migrate From c91c7a74cada7a538f4e9433d02bf021998f624e Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sat, 27 Jan 2024 16:10:39 +0900 Subject: [PATCH 24/28] [update] ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99f15a6..effbde8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,11 +61,12 @@ jobs: # Job SECRET_KEY: ${{ secrets.SECRET_KEY }} DB_NAME: ${{ secrets.DB_NAME }} DB_USER: root - DB_PASSWORD: '${{ secrets.DB_PASSWORD }}' + DB_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }} DB_HOST: 127.0.0.1 DB_PORT: ${{ secrets.DB_PORT }} run: | + cd backend python manage.py makemigrations python manage.py migrate From 2ecbfaae03b43150b70640f202f88ca1d16f2385 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sat, 27 Jan 2024 16:15:26 +0900 Subject: [PATCH 25/28] [update] ci.yml --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index effbde8..172d889 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,9 +75,9 @@ jobs: # Job env: SECRET_KEY: ${{ secrets.SECRET_KEY }} DB_NAME: ${{ secrets.DB_NAME }} - DB_USER: ${{ secrets.DB_USER }} - DB_PASSWORD: ${{ secrets.DB_PASSWORD }} - DB_HOST: ${{ secrets.DB_HOST }} + DB_USER: root + DB_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }} + DB_HOST: 127.0.0.1 DB_PORT: ${{ secrets.DB_PORT }} run: | cd backend From 81f1abd1af8842a334f9fc30c53dee8567ba9229 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sat, 27 Jan 2024 16:37:39 +0900 Subject: [PATCH 26/28] [update] ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 172d889..198e3cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: # Job SECRET_KEY: ${{ secrets.SECRET_KEY }} DB_NAME: ${{ secrets.DB_NAME }} DB_USER: root - DB_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }} + DB_PASSWORD: '${{ secrets.MYSQL_ROOT_PASSWORD }}' DB_HOST: 127.0.0.1 DB_PORT: ${{ secrets.DB_PORT }} run: | From 03a3d9b0d7a54b715432b925469196871912665e Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sun, 28 Jan 2024 17:25:23 +0900 Subject: [PATCH 27/28] [update] ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 198e3cf..9fb026d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,10 +76,10 @@ jobs: # Job SECRET_KEY: ${{ secrets.SECRET_KEY }} DB_NAME: ${{ secrets.DB_NAME }} DB_USER: root - DB_PASSWORD: '${{ secrets.MYSQL_ROOT_PASSWORD }}' + DB_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }} DB_HOST: 127.0.0.1 DB_PORT: ${{ secrets.DB_PORT }} run: | cd backend - mysql --host 127.0.0.1 --port 3306 -u ${{ secrets.DB_USER }} -p ${{ secrets.DB_PASSWORD }} + mysql --host 127.0.0.1 --port 3306 -u root -p${{ MYSQL_ROOT_PASSWORD }} python manage.py test \ No newline at end of file From f6568f7105a17d3b0e99c78bd6827abb72cae256 Mon Sep 17 00:00:00 2001 From: Jeongwoo Kim Date: Sun, 28 Jan 2024 17:28:55 +0900 Subject: [PATCH 28/28] [update] ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9fb026d..98e8fb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,9 +60,9 @@ jobs: # Job env: SECRET_KEY: ${{ secrets.SECRET_KEY }} DB_NAME: ${{ secrets.DB_NAME }} - DB_USER: root + DB_USER: ${{ secrets.DB_USER }} DB_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }} - DB_HOST: 127.0.0.1 + DB_HOST: ${{ secrets.DB_HOST }} DB_PORT: ${{ secrets.DB_PORT }} run: | @@ -75,9 +75,9 @@ jobs: # Job env: SECRET_KEY: ${{ secrets.SECRET_KEY }} DB_NAME: ${{ secrets.DB_NAME }} - DB_USER: root + DB_USER: ${{ secrets.DB_USER }} DB_PASSWORD: ${{ secrets.MYSQL_ROOT_PASSWORD }} - DB_HOST: 127.0.0.1 + DB_HOST: ${{ secrets.DB_HOST }} DB_PORT: ${{ secrets.DB_PORT }} run: | cd backend