diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index ea77211..3e75d00 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -2,9 +2,9 @@ name: Docker Image CI on: push: - branches: [ "master" ] + branches: [ "master", "coverage" ] pull_request: - branches: [ "master" ] + branches: [ "master" , "coverage"] jobs: @@ -37,12 +37,4 @@ jobs: name: Test run: | cp -r tests/* Videos/ - docker-compose -f docker-compose-prod.yml run --rm web ./wait-for-it.sh db:5432 -- python3 manage.py test - - - name: Build and push - uses: docker/build-push-action@v3 - with: - context: . - file: ./backend/Dockerfile.prod - push: true - tags: webmultimedia/http-streaming-server:master + docker-compose -f docker-compose-prod.yml run --rm web bash -c "./wait-for-it.sh db:5432 -- coverage run --source='.' manage.py test && coverage report -m" diff --git a/backend/Dockerfile b/backend/Dockerfile index ad8cd23..2314e49 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ #See Dockerfile.baseimage to see how the baseimage is build. -FROM webmultimedia/http-streaming-server-baseimage:1.0.3 +FROM webmultimedia/http-streaming-server-baseimage:1.0.4 ENV PYTHONUNBUFFERED 1 diff --git a/backend/Dockerfile.baseimage b/backend/Dockerfile.baseimage index b12f752..465a826 100644 --- a/backend/Dockerfile.baseimage +++ b/backend/Dockerfile.baseimage @@ -1,3 +1,4 @@ +#docker build -f backend/Dockerfile.baseimage -t webmultimedia/http-streaming-server-baseimage:1.0.4 . FROM jrottenberg/ffmpeg:4.4-ubuntu2004 ENV TZ=Europe/Paris RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/backend/Dockerfile.prod b/backend/Dockerfile.prod index 6a025e6..47d4c88 100644 --- a/backend/Dockerfile.prod +++ b/backend/Dockerfile.prod @@ -15,7 +15,7 @@ RUN npm run build #Build the backend #See Dockerfile.baseimage to see how the baseimage is build. -FROM webmultimedia/http-streaming-server-baseimage:1.0.3 +FROM webmultimedia/http-streaming-server-baseimage:1.0.4 ENV PYTHONUNBUFFERED 1 diff --git a/backend/requirements.txt b/backend/requirements.txt index bdeba75..13df695 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -18,3 +18,4 @@ ffsubsync==0.4.3 requests==2.31.0 django-filebrowser==4.0.3 django-grappelli==3.0.3 +coverage==7.4.0