Skip to content

Commit

Permalink
Add coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
DerouineauNicolas committed Jan 17, 2024
1 parent c5fd1dd commit 9738d57
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Docker Image CI

on:
push:
branches: [ "master" ]
branches: [ "master", "coverage" ]
pull_request:
branches: [ "master" ]
branches: [ "master" , "coverage"]

jobs:

Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions backend/Dockerfile.baseimage
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions backend/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9738d57

Please sign in to comment.