From 2d47e4c6a83758818503633b5a2a0bc2ad7759a9 Mon Sep 17 00:00:00 2001
From: root <root@ns333570.ip-188-165-217.eu>
Date: Fri, 3 Nov 2017 09:13:35 +0000
Subject: [PATCH] peertube image

---
 cachethq/rootfs/cachetHQ/env          | 2 +-
 peertube/Dockerfile                   | 9 +++++----
 peertube/rootfs/usr/local/bin/startup | 6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cachethq/rootfs/cachetHQ/env b/cachethq/rootfs/cachetHQ/env
index 3a62093..866bc20 100644
--- a/cachethq/rootfs/cachetHQ/env
+++ b/cachethq/rootfs/cachetHQ/env
@@ -33,7 +33,7 @@ MAIL_ADDRESS=netdata@dryusdan.fr
 MAIL_NAME="Status des services DryCat"
 MAIL_ENCRYPTION=none
 
-REDIS_HOST=172.null
+REDIS_HOST=null
 REDIS_DATABASE=null
 REDIS_PORT=null
 REDIS_PASSWORD=null
diff --git a/peertube/Dockerfile b/peertube/Dockerfile
index 6a46f79..63089d9 100644
--- a/peertube/Dockerfile
+++ b/peertube/Dockerfile
@@ -18,25 +18,26 @@ ENV UID=991 GID=991 \
 
 RUN echo "deb http://ftp.debian.org/debian jessie-backports main contrib non-free" >> /etc/apt/sources.list \
 	&& apt-get update \
-	&& apt-get -y --no-install-recommends  install ffmpeg openssl curl git build-essential nginx-light \
+	&& apt-get -y install curl \
+	&& apt-get -y --no-install-recommends  install ffmpeg openssl git build-essential nginx-light \
 	&& apt-get clean \
 	&& curl -sL https://deb.nodesource.com/setup_6.x | bash - \
 	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
 	&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
 	&& apt-get update \
 	&& apt-get -y install -y nodejs yarn --no-install-recommends \
-	&& git clone https://github.com/Chocobozzz/PeerTube /PeerTube \
+	&& git clone --branch develop https://github.com/Chocobozzz/PeerTube /PeerTube \
 	&& cd /PeerTube \
 	&& npm install \
 	&& yarn install \
 	&& npm run build \
-	&& apt-get purge -y  build-essential curl \
+	&& apt-get remove --purge --yes build-essential curl git  \
 	&& apt-get autoremove -y \
 	&& apt-get clean \
 	&& rm -rf /PeerTube/.git \
 	&& rm -rf /tmp/* /var/lib/apt/lists/* /var/cache/debconf/*-old \
 	&& rm -rf /usr/share/man/?? \
-	&& rm -rf /usr/share/man/??_*
+	&& rm -rf /usr/share/man/??_* 
 
 
 EXPOSE 8080
diff --git a/peertube/rootfs/usr/local/bin/startup b/peertube/rootfs/usr/local/bin/startup
index 4a54539..cead416 100755
--- a/peertube/rootfs/usr/local/bin/startup
+++ b/peertube/rootfs/usr/local/bin/startup
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup --gid ${GID} peertube && adduser --shell /bin/sh --group peertube -uid ${UID} peertube
-
+#addgroup --gid ${GID} peertube && adduser --disabled-password --shell /bin/sh --gid ${GID} --uid ${UID} --gecos "" peertube
+groupadd -g ${GID} peertube && useradd -u ${UID} -M -g ${GID} peertube
 
 cd /PeerTube
 
@@ -27,4 +27,4 @@ if [ $# -eq 0 ]; then
    su - peertube -c "NODE_ENV=production npm start"
 else
    su - peertube -c "NODE_ENV=production npm $#"
-fi
\ No newline at end of file
+fi