Update Janitor Dockerfile

[github/Chocobozzz/PeerTube.git] / support / docker / dev / Dockerfile

diff --git a/support/docker/dev/Dockerfile b/support/docker/dev/Dockerfile
index 8a99496a637916812bd6601bf309ca2b85e8707b..2b4f2b215f74aa05870b0bc8bbc52e8682406140 100644 (file)
--- a/support/docker/dev/Dockerfile
+++ b/support/docker/dev/Dockerfile
@@ -1,5 +1,4 @@
-FROM janx/ubuntu-dev
-MAINTAINER Jan Keromnes <janx@linux.com>
+FROM janitortechnology/ubuntu-dev
 
 # Install PeerTube's dependencies.
 # Packages are from https://github.com/Chocobozzz/PeerTube#dependencies
@@ -12,22 +11,22 @@ RUN sudo apt-get update -q && sudo apt-get install -qy \
 RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube
 WORKDIR /home/user/PeerTube
 
-# Configure Cloud9 IDE to use PeerTube's source directory as workspace (-w).
-RUN sudo sed -i "s/-w \/home\/user/-w \/home\/user\/PeerTube/" /etc/supervisord.conf
+# Configure the IDEs to use Janitor's source directory as workspace.
+ENV WORKSPACE /home/user/PeerTube/
 
 # Install dependencies.
 RUN yarn install --pure-lockfile
 
 # Configure Janitor for PeerTube.
-ADD janitor.json /home/user/
-RUN sudo chown user:user /home/user/janitor.json
+COPY --chown=user:user janitor.json /home/user/
 
 # Configure and build PeerTube.
-ADD create_user.sql /tmp/
-RUN sudo service postgresql start && \
-    sudo -u postgres psql --file=/tmp/create_user.sql
+COPY create_user.sql /tmp/
+RUN sudo service postgresql start \
+ && sudo -u postgres psql --file=/tmp/create_user.sql \
+ && npm run build
 
-ADD supervisord.conf /tmp/supervisord-extra.conf
+COPY --chown=user:user supervisord.conf /tmp/supervisord-extra.conf
 RUN cat /tmp/supervisord-extra.conf | sudo tee -a /etc/supervisord.conf
 
 EXPOSE 3000 9000