Merge pull request #598 from liangliangyy/master

sync

Author: liangliangyy

.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}}
 
 

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