aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJan Keromnes <janx@linux.com>2018-05-16 20:25:56 +0000
committerChocobozzz <me@florianbigard.com>2018-05-17 08:18:56 +0200
commita14d3b6b23816299dba2c5e1010ea8f6eb3d3289 (patch)
tree698a6a1347c720303d746a0605fb2809cfc10b52
parent5fcbd89841be29b373c6e4c8eeaa1f27414c8c7d (diff)
downloadPeerTube-a14d3b6b23816299dba2c5e1010ea8f6eb3d3289.tar.gz
PeerTube-a14d3b6b23816299dba2c5e1010ea8f6eb3d3289.tar.zst
PeerTube-a14d3b6b23816299dba2c5e1010ea8f6eb3d3289.zip
Update Janitor Dockerfile
- Upgrade to newer janitortechnology/ubuntu-dev base image - Fix workspace folder - Add Theia port - Dockerfile best practices
-rw-r--r--support/docker/dev/Dockerfile14
-rw-r--r--support/docker/dev/janitor.json4
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 @@
1FROM janx/ubuntu-dev 1FROM janitortechnology/ubuntu-dev
2MAINTAINER Jan Keromnes <janx@linux.com>
3 2
4# Install PeerTube's dependencies. 3# Install PeerTube's dependencies.
5# Packages are from https://github.com/Chocobozzz/PeerTube#dependencies 4# Packages are from https://github.com/Chocobozzz/PeerTube#dependencies
@@ -12,23 +11,22 @@ RUN sudo apt-get update -q && sudo apt-get install -qy \
12RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube 11RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube
13WORKDIR /home/user/PeerTube 12WORKDIR /home/user/PeerTube
14 13
15# Configure Cloud9 IDE to use PeerTube's source directory as workspace (-w). 14# Configure the IDEs to use Janitor's source directory as workspace.
16RUN sudo sed -i "s/-w \/home\/user/-w \/home\/user\/PeerTube/" /etc/supervisord.conf 15ENV WORKSPACE /home/user/PeerTube/
17 16
18# Install dependencies. 17# Install dependencies.
19RUN yarn install --pure-lockfile 18RUN yarn install --pure-lockfile
20 19
21# Configure Janitor for PeerTube. 20# Configure Janitor for PeerTube.
22ADD janitor.json /home/user/ 21COPY --chown=user:user janitor.json /home/user/
23RUN sudo chown user:user /home/user/janitor.json
24 22
25# Configure and build PeerTube. 23# Configure and build PeerTube.
26ADD create_user.sql /tmp/ 24COPY create_user.sql /tmp/
27RUN sudo service postgresql start \ 25RUN sudo service postgresql start \
28 && sudo -u postgres psql --file=/tmp/create_user.sql \ 26 && sudo -u postgres psql --file=/tmp/create_user.sql \
29 && npm run build 27 && npm run build
30 28
31ADD supervisord.conf /tmp/supervisord-extra.conf 29COPY --chown=user:user supervisord.conf /tmp/supervisord-extra.conf
32RUN cat /tmp/supervisord-extra.conf | sudo tee -a /etc/supervisord.conf 30RUN cat /tmp/supervisord-extra.conf | sudo tee -a /etc/supervisord.conf
33 31
34EXPOSE 3000 9000 32EXPOSE 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 @@
23 "label": "Cloud9", 23 "label": "Cloud9",
24 "proxy": "https" 24 "proxy": "https"
25 }, 25 },
26 "8090": {
27 "label": "Theia",
28 "proxy": "https"
29 },
26 "9000": { 30 "9000": {
27 "label": "PeerTube API", 31 "label": "PeerTube API",
28 "proxy": "https" 32 "proxy": "https"