From 23933e1722863d790deb0f75c2a1250fe5e9994d Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Thu, 13 Dec 2018 16:45:49 +0100
Subject: [PATCH 1/5] Update download links to 1.15.0
---
docs/index.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/index.html b/docs/index.html
index d4d7df8f..6723b918 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -118,19 +118,19 @@
-
+
Download for Linux!
From 6155f424dee4635e1034f93153bf6d166dce90f2 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Mon, 17 Dec 2018 19:23:36 +0100
Subject: [PATCH 2/5] Update download links to 1.16.0
---
docs/index.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/index.html b/docs/index.html
index 6723b918..05b83bde 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -118,19 +118,19 @@
-
+
Download for Linux!
From da4b0ec20ce65aa4616db4e155ef3f8e6f3282d8 Mon Sep 17 00:00:00 2001
From: bounty1342
Date: Tue, 1 Jan 2019 22:32:59 +0100
Subject: [PATCH 3/5] DockerFile to build the server
The following commande help build the server with the required version :
docker build --build-arg versionM3u8=0.2.7-CTBREC --build-arg version=1.16.0 --build-arg memory=-Xmx192m -t bounty1342/ctbrec . --no-cache
Next update could select the branch or commit to ease testing.
---
server/Dockerfile.txt | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 server/Dockerfile.txt
diff --git a/server/Dockerfile.txt b/server/Dockerfile.txt
new file mode 100644
index 00000000..ca6e8f2e
--- /dev/null
+++ b/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
+
From 114098d16c62c52d5e824f223fc77df8a6b0de45 Mon Sep 17 00:00:00 2001
From: bounty1342
Date: Tue, 1 Jan 2019 22:38:07 +0100
Subject: [PATCH 4/5] docker-compose to start the container
Could also be run with docker run -d -p 8080:8080 -v /ctb/app/config:/root/.config/ctbrec/ -v /ctb/video:/root/ctbrec 0xboobface/ctbrec
---
server/docker-compose.yml | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 server/docker-compose.yml
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
new file mode 100644
index 00000000..f9d5bc72
--- /dev/null
+++ b/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
\ No newline at end of file
From 17fcdb405afcc3dae24d698983a9d572519b5b36 Mon Sep 17 00:00:00 2001
From: bounty1342
Date: Tue, 1 Jan 2019 22:43:13 +0100
Subject: [PATCH 5/5] Add info about docker
---
server/README.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/server/README.md b/server/README.md
index 3d227d0b..1d9e724c 100644
--- a/server/README.md
+++ b/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).