Merge branch 'master' into jasmin

docs/index.html

@@ -118,19 +118,19 @@
     	</script>
         <div class="row text-center">
             <div class="col">
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.14.0/ctbrec-1.14.0-win64-jre.zip');">
+                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.16.0/ctbrec-1.16.0-win64-jre.zip');">
                     <i class="fa fa-windows mr-2"></i>
                     Download for Windows!
                 </a>
             </div>
             <div class="col">
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.14.0/ctbrec-1.14.0-macos-jre.zip');">
+                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.16.0/ctbrec-1.16.0-macos-jre.zip');">
                     <i class="fa fa-apple mr-2"></i>
                     Download for macOS!
                 </a>
             </div>
             <div class="col">
-                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.14.0/ctbrec-1.14.0-linux-jre.zip');">
+                <a class="btn btn-xl btn-outline-dark" href="#donate" onclick="downloadFile('https://github.com/0xboobface/ctbrec/releases/download/1.16.0/ctbrec-1.16.0-linux-jre.zip');">
                     <i class="fa fa-linux mr-2"></i>
                     Download for Linux!
                 </a>

server/Dockerfile.txt

@@ -0,0 +1,33 @@
+FROM alpine/git as open-m3u8Git
+WORKDIR /app
+RUN git clone https://github.com/0xboobface/open-m3u8.git
+
+FROM gradle:4.10-jdk10 as open-m3u8Build
+WORKDIR /app/open-m3u8
+COPY --from=open-m3u8Git --chown=gradle:gradle /app /app
+RUN gradle install
+
+FROM alpine/git as ctbrecGit
+WORKDIR /app
+RUN git clone https://github.com/0xboobface/ctbrec.git
+
+FROM maven:3-jdk-11-slim as ctbrecBuild
+ARG ctbrec 
+ARG versionM3u8
+WORKDIR /app/master
+COPY --from=ctbrecGit /app/ctbrec /app
+COPY --from=open-m3u8Build /app/open-m3u8/build/libs/ /app/common/libs/
+RUN mvn clean install:install-file -Dfile=/app/common/libs/open-m3u8-${versionM3u8}.jar  -DgroupId=com.iheartradio.m3u8 -DartifactId=open-m3u8 -Dversion=${versionM3u8} -Dpackaging=jar -DgeneratePom=true
+RUN mvn clean 
+RUN mvn install  
+
+FROM openjdk:12-alpine
+WORKDIR /app
+ARG memory
+ARG version
+ENV artifact ctbrec-server-${version}-final.jar
+ENV path /app/server/target/${artifact}
+COPY --from=ctbrecBuild ${path} ./${artifact}
+EXPOSE 8080
+CMD java ${memory} -cp ${artifact} -Dctbrec.config=/server.json ctbrec.recorder.server.HttpServer
+

server/README.md

@@ -31,5 +31,13 @@ This is the server part, which is only needed, if you want to run ctbrec in clie
 ## Docker
 There is a docker image, created by Github user [1461748123](https://github.com/1461748123), which you can find on [Docker Hub](https://hub.docker.com/r/1461748123/ctbrec/) 
 
+You can also build your own image with the Dockerfile included.
+
+To run them, execute the following command :
+``docker run -d -p 8080:8080 -v /ctb/app/config:/root/.config/ctbrec/ -v /ctb/video:/root/ctbrec 0xboobface/ctbrec``
+
+You can also use the docker-compose with command :
+``docker-compose up``
+
 ## License
 CTB Recorder is licensed under the GPLv3. See [LICENSE.txt](https://raw.githubusercontent.com/0xboobface/ctbrec/master/LICENSE.txt).

server/docker-compose.yml

@@ -0,0 +1,9 @@
+  version: 3
+  services:
+    ctbrec:
+        ports:
+            - '8080:8080'
+        volumes:
+            - 'ctbrec/config:/root/.config/ctbrec/'
+            - 'ctbrec/video:/root/ctbrec'
+        image: bounty1342/ctbrec