From 3b778cd84669e54110b21f3f8e094e7d4141b007 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Aug 2022 15:25:02 +0000
Subject: [PATCH 1/2] Bump django from 4.0.6 to 4.0.7

Bumps [django](https://github.com/django/django) from 4.0.6 to 4.0.7.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/4.0.6...4.0.7)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index dc13859..7bc2c95 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 coverage==6.4
 bleach==5.0.0
-Django==4.0.6
+Django==4.0.7
 django-compressor==4.0
 django-haystack==3.2.1
 django-ipware==4.0.2

From c8e9d2fe28e876246f98f742256d352db4b2f325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=94=E5=90=AC=E9=A3=8E=E5=90=9F?=
 <liangliangyy@gmail.com>
Date: Thu, 18 Aug 2022 14:21:17 +0800
Subject: [PATCH 2/2] Update docker.yml

---
 .github/workflows/docker.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index efa5409..03f94ae 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -7,24 +7,27 @@ on:
       - '**/*.yml'
     branches:
       - 'master'
+      - 'dev'
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      - name: Set env to staging
+        if: endsWith(github.ref, '/dev')
+        run: |
+          echo "DOCKER_TAG=test" >> $GITHUB_ENV
+      - name: Set env to production
+        if: endsWith(github.ref, '/master')
+        run: |
+         echo "DOCKER_TAG=latest" >> $GITHUB_ENV
       - name: Checkout
         uses: actions/checkout@v2
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+    
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -35,12 +38,6 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/djangoblog:latest
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
-      - name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/djangoblog:${{DOCKER_TAG}}