From 231f5d67ad0f3d9fdf083047fa8bfe2f81401632 Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Fri, 28 Oct 2022 11:23:48 +0800 Subject: [PATCH] update github actions --- .dockerignore | 3 ++- .github/workflows/django.yml | 4 ++-- .gitignore | 1 + Dockerfile | 2 +- docker-compose.yml | 18 +++++++++--------- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.dockerignore b/.dockerignore index 48ff43bfe..dab01ceef 100644 --- a/.dockerignore +++ b/.dockerignore @@ -8,4 +8,5 @@ djangoblog/whoosh_index/ uploads/ settings_production.py *.md -docs/ \ No newline at end of file +docs/ +logs/ \ No newline at end of file diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index bef254428..b99e92467 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -26,7 +26,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ 3.8, 3.9 ] + python-version: [ "3.8", "3.9","3.10" ] steps: - name: Start MySQL @@ -66,7 +66,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ 3.8, 3.9 ] + python-version: [ "3.8", "3.9","3.10" ] steps: - name: Start MySQL diff --git a/.gitignore b/.gitignore index b54f038cd..92ad5afdd 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ coverage.xml # Django stuff: *.log +logs/ # Sphinx documentation docs/_build/ diff --git a/Dockerfile b/Dockerfile index f8a86f2c6..871a9d0c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3 +FROM python:3.10 ENV PYTHONUNBUFFERED 1 WORKDIR /code/djangoblog/ RUN apt-get install default-libmysqlclient-dev -y && \ diff --git a/docker-compose.yml b/docker-compose.yml index 47a0b37da..29510a2e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,15 +4,15 @@ services: db: image: mysql:latest restart: always - command: - - mysqld - - --max_connections=3000 - - --wait_timeout=600 - - --interactive_timeout=600 - - --thread_cache_size=50 - - --default-authentication-plugin=mysql_native_password - - --character-set-server=utf8 - - --collation-server=utf8_general_ci +# command: +# - mysqld +# - --max_connections=3000 +# - --wait_timeout=600 +# - --interactive_timeout=600 +# - --thread_cache_size=50 +# - --default-authentication-plugin=mysql_native_password +# - --character-set-server=utf8 +# - --collation-server=utf8_general_ci environment: - MYSQL_DATABASE=djangoblog - MYSQL_ROOT_PASSWORD=DjAnGoBlOg!2!Q@W#E