From 396626c610088f5760db844ebaeecdf54d037702 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Mar 2022 23:20:01 +0000 Subject: [PATCH 1/3] Bump pillow from 9.0.0 to 9.0.1 Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.0 to 9.0.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/9.0.0...9.0.1) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 912f257..2c9c71c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ jieba==0.42.1 jsonpickle==2.0.0 Markdown==3.3.6 mysqlclient==2.1.0 -Pillow==9.0.0 +Pillow==9.0.1 Pygments==2.10.0 python-logstash==0.4.6 python-memcached==1.59 From 0f8a44347626f2c4ae7024bb97b66b93e580ad01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=94=E5=90=AC=E9=A3=8E=E5=90=9F?= Date: Mon, 21 Mar 2022 23:53:19 +0800 Subject: [PATCH 2/3] Update docker_start.sh --- bin/docker_start.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/docker_start.sh b/bin/docker_start.sh index 911bbee..4cd9d0c 100644 --- a/bin/docker_start.sh +++ b/bin/docker_start.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash NAME="djangoblog" # Name of the application -DJANGODIR=/code/djangoBlog # Django project directory +DJANGODIR=/code/djangoblog # Django project directory USER=root # the user to run as GROUP=root # the group to run as NUM_WORKERS=1 # how many worker processes should Gunicorn spawn @@ -31,4 +31,4 @@ exec gunicorn ${DJANGO_WSGI_MODULE}:application \ --log-level=debug \ --log-file=- \ --worker-class gevent \ ---threads 4 \ No newline at end of file +--threads 4 From 63fa63c3ae510b3c50ad1d61354c9a4320a923ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=94=E5=90=AC=E9=A3=8E=E5=90=9F?= Date: Tue, 22 Mar 2022 00:07:57 +0800 Subject: [PATCH 3/3] Update docker.yml --- .github/workflows/docker.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 505444b..5a9962d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -30,15 +30,4 @@ jobs: push: true tags: ${{ secrets.DOCKERHUB_USERNAME }}/djangoblog:latest - - name: ssh deploy - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - port: ${{ secrets.PORT }} - script: | - docker pull ${{ secrets.DOCKERHUB_USERNAME }}/djangoblog:latest - cd ${{ secrets.DOCKERPATH }} - docker-compose up -d - docker restart memcached +