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

This commit is contained in:
pluja 2020-10-10 21:26:36 +02:00
commit 0f573dc7df
2 changed files with 6 additions and 2 deletions

View File

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

View File

@ -26,13 +26,15 @@ jobs:
with: with:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} 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 - name: cache docker cache
uses: actions/cache@v2.1.1 uses: actions/cache@v2.1.1
with: with:
path: ${{ github.workspace }}/cache path: ${{ github.workspace }}/cache
key: ${{ runner.os }}-docker-${{ hashFiles('**/requirements.txt') }} key: ${{ runner.os }}-docker-${{ hashFiles('**/requirements.txt') }}-${{ hashFiles('**/dockerhash.txt') }}
restore-keys: | restore-keys: |
${{ runner.os }}-docker-${{ hashFiles('**/requirements.txt') }} ${{ runner.os }}-docker-
- name: Build and push - name: Build and push
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with: