Skip to content

Commit

Permalink
Merge pull request #619 from liangliangyy/dev
Browse files Browse the repository at this point in the history
update github actions
  • Loading branch information
liangliangyy authored Oct 28, 2022
2 parents e3db657 + 231f5d6 commit c6277d2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ djangoblog/whoosh_index/
uploads/
settings_production.py
*.md
docs/
docs/
logs/
4 changes: 2 additions & 2 deletions .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ coverage.xml

# Django stuff:
*.log
logs/

# Sphinx documentation
docs/_build/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && \
Expand Down
18 changes: 9 additions & 9 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c6277d2

Please sign in to comment.