diff options
Diffstat (limited to 'support')
-rw-r--r-- | support/docker/dev/Dockerfile | 14 | ||||
-rw-r--r-- | 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 @@ | |||
1 | FROM janx/ubuntu-dev | 1 | FROM janitortechnology/ubuntu-dev |
2 | MAINTAINER 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 \ | |||
12 | RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube | 11 | RUN git clone -b develop https://github.com/Chocobozzz/PeerTube /home/user/PeerTube |
13 | WORKDIR /home/user/PeerTube | 12 | WORKDIR /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. |
16 | RUN sudo sed -i "s/-w \/home\/user/-w \/home\/user\/PeerTube/" /etc/supervisord.conf | 15 | ENV WORKSPACE /home/user/PeerTube/ |
17 | 16 | ||
18 | # Install dependencies. | 17 | # Install dependencies. |
19 | RUN yarn install --pure-lockfile | 18 | RUN yarn install --pure-lockfile |
20 | 19 | ||
21 | # Configure Janitor for PeerTube. | 20 | # Configure Janitor for PeerTube. |
22 | ADD janitor.json /home/user/ | 21 | COPY --chown=user:user janitor.json /home/user/ |
23 | RUN sudo chown user:user /home/user/janitor.json | ||
24 | 22 | ||
25 | # Configure and build PeerTube. | 23 | # Configure and build PeerTube. |
26 | ADD create_user.sql /tmp/ | 24 | COPY create_user.sql /tmp/ |
27 | RUN sudo service postgresql start \ | 25 | RUN 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 | ||
31 | ADD supervisord.conf /tmp/supervisord-extra.conf | 29 | COPY --chown=user:user supervisord.conf /tmp/supervisord-extra.conf |
32 | RUN cat /tmp/supervisord-extra.conf | sudo tee -a /etc/supervisord.conf | 30 | RUN cat /tmp/supervisord-extra.conf | sudo tee -a /etc/supervisord.conf |
33 | 31 | ||
34 | EXPOSE 3000 9000 | 32 | 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 @@ | |||
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" |