From da7b93a03727feeb06d31ac64357dfae9172c40f Mon Sep 17 00:00:00 2001 From: Jan Keromnes Date: Thu, 25 Jan 2018 12:35:12 +0100 Subject: [PATCH 1/2] Pre-build PeerTube again in dev Dockerfile. PeerTube pre-build was removed in #207 but is still valuable. --- support/docker/dev/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/support/docker/dev/Dockerfile b/support/docker/dev/Dockerfile index 8a99496a637..0118a824852 100644 --- a/support/docker/dev/Dockerfile +++ b/support/docker/dev/Dockerfile @@ -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 From 69847573c415e69f1c539e52be11eace90c0ed49 Mon Sep 17 00:00:00 2001 From: Jan Keromnes Date: Thu, 25 Jan 2018 14:41:10 +0100 Subject: [PATCH 2/2] Add --disable-host-check to development watch script to support proxies. See also https://github.com/webpack/webpack-dev-server/issues/882 --- scripts/watch/client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/watch/client.sh b/scripts/watch/client.sh index d8c3a254740..2481e226958 100755 --- a/scripts/watch/client.sh +++ b/scripts/watch/client.sh @@ -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