From a14d3b6b23816299dba2c5e1010ea8f6eb3d3289 Mon Sep 17 00:00:00 2001
From: Jan Keromnes <janx@linux.com>
Date: Wed, 16 May 2018 20:25:56 +0000
Subject: Update Janitor Dockerfile

- Upgrade to newer janitortechnology/ubuntu-dev base image
- Fix workspace folder
- Add Theia port
- Dockerfile best practices
---
 support/docker/dev/Dockerfile   | 14 ++++++--------
 support/docker/dev/janitor.json |  4 ++++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/support/docker/dev/Dockerfile b/support/docker/dev/Dockerfile
index 0118a8248..2b4f2b215 100644
--- 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,23 +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/
+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
diff --git a/support/docker/dev/janitor.json b/support/docker/dev/janitor.json
index 4051e8bcd..5acdf3060 100644
--- a/support/docker/dev/janitor.json
+++ b/support/docker/dev/janitor.json
@@ -23,6 +23,10 @@
       "label": "Cloud9",
       "proxy": "https"
     },
+    "8090": {
+      "label": "Theia",
+      "proxy": "https"
+    },
     "9000": {
       "label": "PeerTube API",
       "proxy": "https"
-- 
cgit v1.2.3