Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pre-build PeerTube again in dev Dockerfile. #251

Merged
merged 2 commits into from
Jan 25, 2018
Merged

Pre-build PeerTube again in dev Dockerfile. #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da7b93a
Pre-build PeerTube again in dev Dockerfile.
jankeromnes Jan 25, 2018
6984757
Add --disable-host-check to development watch script to support proxies.
jankeromnes Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/watch/client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

cd client || exit -1

npm run ng -- server --hmr --host 0.0.0.0 --port 3000
npm run ng -- server --hmr --host 0.0.0.0 --disable-host-check --port 3000
5 changes: 3 additions & 2 deletions support/docker/dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ RUN sudo chown user:user /home/user/janitor.json

# Configure and build PeerTube.
ADD create_user.sql /tmp/
RUN sudo service postgresql start && \
sudo -u postgres psql --file=/tmp/create_user.sql
RUN sudo service postgresql start \
&& sudo -u postgres psql --file=/tmp/create_user.sql \
&& npm run build

ADD supervisord.conf /tmp/supervisord-extra.conf
RUN cat /tmp/supervisord-extra.conf | sudo tee -a /etc/supervisord.conf
Expand Down