Merge branch 'dev-indep' of https://github.com/ytorg/yotter into dev-indep

.dockerignore

@@ -1,3 +1,4 @@
+.circleci
 .git
 .github
 .gitignore
@@ -6,3 +7,4 @@ Dockerfile
 docker-compose.yml
 LICENSE
 *.md
+dockerhash.txt

.github/workflows/docker-build.yml

@@ -26,13 +26,15 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Get hash of latest image
+        run: docker pull python:3-alpine && docker inspect --format='{{index .RepoDigests 0}}' python:3-alpine > dockerhash.txt
       - name: cache docker cache
         uses: actions/cache@v2.1.1
         with:
           path: ${{ github.workspace }}/cache
-          key: ${{ runner.os }}-docker-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-docker-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/dockerhash.txt') }}
           restore-keys: |
-            ${{ runner.os }}-docker-${{ hashFiles('**/requirements.txt') }}
+            ${{ runner.os }}-docker-
       - name: Build and push
         uses: docker/build-push-action@v2
         with: