Skip to content

Commit a844b4a

Browse files
authored
Support running in docker (#547)
* Support running in docker * Use Ubuntu 20.04 with new deps and add source * Move installation guide to wiki
1 parent e031b17 commit a844b4a

File tree

3 files changed

+30
-8
lines changed

3 files changed

+30
-8
lines changed

Dockerfile

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
FROM ubuntu:20.04
2+
ENV TZ=Etc/GMT
3+
ENV DEBIAN_FRONTEND=noninteractive
4+
5+
EXPOSE 80
6+
7+
RUN apt update
8+
RUN apt -y install \
9+
apache2 apache2-doc php php-dev php-xml php-curl php-xdebug libapache2-mod-php \
10+
python2.7 \
11+
openjdk-8-jdk ant
12+
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
13+
RUN python2.7 get-pip.py
14+
RUN pip2 install matplotlib
15+
RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
16+
17+
COPY --chown=www-data:www-data . /var/www/html/
18+
19+
CMD apachectl -D FOREGROUND

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# DASH-IF Conformance Software
22

3-
This repository provides the source code for MPEG-DASH/DASH-IF Conformance Software/Validator. It has been extended according to further standards, such as CMAF, DVB-DASH, HbbTV, and CTA WAVE.
3+
This repository provides the source code for MPEG-DASH/DASH-IF Conformance Software/Validator. It has been extended according to further standards, such as CMAF, DVB-DASH, HbbTV, and CTA WAVE.
44

5-
This repository contains the common directory (Utils) and submodules:
5+
This repository contains the common directory (Utils) and submodules:
66
* [DASH](https://github.com/Dash-Industry-Forum/DASH)
77
* [HLS](https://github.com/Dash-Industry-Forum/HLS)
8-
* [CMAF](https://github.com/Dash-Industry-Forum/CMAF)
8+
* [CMAF](https://github.com/Dash-Industry-Forum/CMAF)
99
* [CTAWAVE](https://github.com/Dash-Industry-Forum/CTAWAVE)
10-
* [HbbTV_DVB](https://github.com/Dash-Industry-Forum/HbbTV_DVB)
10+
* [HbbTV_DVB](https://github.com/Dash-Industry-Forum/HbbTV_DVB)
1111
* [ISOSegmentValidator](https://github.com/Dash-Industry-Forum/ISOSegmentValidator)
1212
* [Conformance-Frontend](https://github.com/Dash-Industry-Forum/Conformance-Frontend)
1313
* [Conformance-Frontend-HLS](https://github.com/Dash-Industry-Forum/Conformance-Frontend-HLS)
@@ -17,9 +17,9 @@ Each submodule is a repository on its own with its respective functionalities an
1717

1818
### Installation
1919

20-
For the complete installation including dependencies etc, please refer [Installation guide](https://github.com/Dash-Industry-Forum/DASH-IF-Conformance/wiki/Installation--guide). A pdf version of the installation guide can be found [here](https://github.com/Dash-Industry-Forum/DASH-IF-Conformance/blob/master/Doc/Conformance%20Software%20Installation%20Guide.pdf).
20+
For the complete installation including dependencies etc, please refer to [Installation guide]( https://github.com/Dash-Industry-Forum/DASH-IF-Conformance/wiki/Installation--guide).
2121

22-
To clone the IntegratedConformance with all the submodules, use the command,
22+
To clone the IntegratedConformance with all the submodules, use the command,
2323

2424
`git clone --recurse-submodules https://github.com/Dash-Industry-Forum/DASH-IF-Conformance`
2525

@@ -37,9 +37,9 @@ If the issue is known to correspond to a specific submodule functionality, pleas
3737

3838
* [DASH issues](https://github.com/Dash-Industry-Forum/DASH/issues)
3939
* [HLS issues](https://github.com/Dash-Industry-Forum/HLS/issues)
40-
* [CMAF issues](https://github.com/Dash-Industry-Forum/CMAF/issues)
40+
* [CMAF issues](https://github.com/Dash-Industry-Forum/CMAF/issues)
4141
* [CTAWAVE issues](https://github.com/Dash-Industry-Forum/CTAWAVE/issues)
42-
* [HbbTV_DVB issues](https://github.com/Dash-Industry-Forum/HbbTV_DVB/issues)
42+
* [HbbTV_DVB issues](https://github.com/Dash-Industry-Forum/HbbTV_DVB/issues)
4343
* [ISOSegmentValidator issues](https://github.com/Dash-Industry-Forum/ISOSegmentValidator/issues)
4444
* [Conformance-Frontend issues](https://github.com/Dash-Industry-Forum/Conformance-Frontend/issues)
4545
* [Conformance-Frontend-HLS issues](https://github.com/Dash-Industry-Forum/Conformance-Frontend-HLS/issues)

build.sh

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#/bin/sh
2+
3+
docker build -t dash-if-conformance:latest -t dash-if-conformance:$(git rev-parse --short HEAD) .

0 commit comments

Comments
 (0)