Merge branch 'develop' into pr/1217

5 files changed, 57 insertions, 65 deletions

diff --git a/support/docker/dev/Dockerfile b/support/docker/dev/Dockerfile
index 2b4f2b215..8e049f3f6 100644
--- a/support/docker/dev/Dockerfile
+++ b/support/docker/dev/Dockerfile
@@ -1,32 +1,46 @@
-FROM janitortechnology/ubuntu-dev
+FROM ubuntu:bionic
+
+# Avoid tzdata interactive dialog
+ENV DEBIAN_FRONTEND=noninteractive
 
 # Install PeerTube's dependencies.
 # Packages are from https://github.com/Chocobozzz/PeerTube#dependencies
-RUN sudo apt-get update -q && sudo apt-get install -qy \
- ffmpeg \
- postgresql \
- openssl
+RUN apt-get update -q && apt-get install -qy \
+      curl \
+      ffmpeg \
+      g++ \
+      git \
+      gnupg \
+      make \
+      nano \
+      openssl \
+      postgresql \
+      postgresql-contrib \
+      redis-server \
+    && curl -sL https://deb.nodesource.com/setup_8.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 install -qy nodejs yarn \
+    && rm -rf /var/lib/apt/lists/*
 
 # Download PeerTube's source code.
 RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube
 WORKDIR /home/user/PeerTube
 
-# Configure the IDEs to use Janitor's source directory as workspace.
-ENV WORKSPACE /home/user/PeerTube/
-
-# Install dependencies.
-RUN yarn install --pure-lockfile
+# Copy postgresql setup script
+COPY setup_postgres.sql /tmp/
 
-# Configure Janitor for PeerTube.
-COPY --chown=user:user janitor.json /home/user/
+# Install Node.js dependencies and setup PostgreSQL
+RUN yarn install --pure-lockfile \
+    && service postgresql start \
+    && su postgres -c "psql --file=/tmp/setup_postgres.sql"
 
-# Configure and build PeerTube.
-COPY create_user.sql /tmp/
-RUN sudo service postgresql start \
- && sudo -u postgres psql --file=/tmp/create_user.sql \
- && npm run build
-
-COPY --chown=user:user supervisord.conf /tmp/supervisord-extra.conf
-RUN cat /tmp/supervisord-extra.conf | sudo tee -a /etc/supervisord.conf
+# Expose PeerTube sources as a volume
+VOLUME /home/user/PeerTube
 
+# Expose API and frontend
 EXPOSE 3000 9000
+
+# Start PostgreSQL and Redis
+CMD ["service postgresql start && redis-server"]
diff --git a/support/docker/dev/janitor.json b/support/docker/dev/janitor.json
deleted file mode 100644
index 5acdf3060..000000000
--- a/support/docker/dev/janitor.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "name": "PeerTube",
-  "description": "Federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.",
-  "icon": "https://janitor.technology/img/peertube.svg",
-  "docker": {
-    "image": "chocobozzz/peertube-dev"
-  },
-  "ports": {
-    "22": {
-      "label": "SSH",
-      "proxy": "none"
-    },
-    "3000": {
-      "label": "PeerTube web app",
-      "proxy": "https",
-      "preview": true
-    },
-    "8088": {
-      "label": "VNC",
-      "proxy": "https"
-    },
-    "8089": {
-      "label": "Cloud9",
-      "proxy": "https"
-    },
-    "8090": {
-      "label": "Theia",
-      "proxy": "https"
-    },
-    "9000": {
-      "label": "PeerTube API",
-      "proxy": "https"
-    }
-  },
-  "scripts": {
-    "Start PeerTube": "npm run dev",
-    "Build PeerTube": "npm run build",
-    "Run tests": "npm test",
-    "Update source code": "git pull --rebase origin",
-    "Send to code review": "hub pull-request"
-  }
-}
diff --git a/support/docker/dev/create_user.sql b/support/docker/dev/setup_postgres.sql
index c2fbcf27e..0937f9d19 100644
--- a/support/docker/dev/create_user.sql
+++ b/support/docker/dev/setup_postgres.sql
@@ -1,3 +1,6 @@
 create database peertube_dev;
 create user peertube password 'peertube';
 grant all privileges on database peertube_dev to peertube;
+\c peertube_dev
+CREATE EXTENSION pg_trgm;
+CREATE EXTENSION unaccent;
diff --git a/support/docker/dev/supervisord.conf b/support/docker/dev/supervisord.conf
deleted file mode 100644
index b2e1682df..000000000
--- a/support/docker/dev/supervisord.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[program:postgresql]
-user = user
-command = sudo -u postgres /usr/lib/postgresql/9.5/bin/postgres -D /var/lib/postgresql/9.5/main -c config_file=/etc/postgresql/9.5/main/postgresql.conf
diff --git a/support/docker/dev/usage.md b/support/docker/dev/usage.md
new file mode 100644
index 000000000..319d7db30
--- /dev/null
+++ b/support/docker/dev/usage.md
@@ -0,0 +1,20 @@
+### Usage
+1. Build the image:
+        ```
+        docker build -t my_peertube_dev .
+        ```
+1. Start the container:
+        ```
+        docker run -d -i -p 3000:3000 -p 9000:9000 --name peertube my_peertube_dev
+        ```
+        This will create a new Docker volume containing PeerTube sources.
+
+1. Start PeerTube inside the container:
+        ```
+        docker exec -it peertube npm run dev
+        ```
+1. In another window, find the path to the Docker volume
+        ```
+        docker inspect peertube | less +/Mounts
+        ```
+        You can now make changes to the files. They should be automatically recompiled.