Get static files working on windows

Dockerfile

@@ -18,8 +18,9 @@ WORKDIR /tcd
 ADD . /tcd/
 
 # Install our node/python requirements
-RUN pip install -r ./requirements_common.txt && npm install
+RUN pip install -r ./requirements_common.txt
+RUN npm install
 
 # Compile all the static files
 RUN npm rebuild node-sass
-RUN python ./tabbycat/manage.py collectstatic --no-input
+RUN python ./tabbycat/manage.py collectstatic --no-input

bin/docker-run.sh

@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 #   Shorthand to migrate and runserver in docker
 
+# Move up to where we can run commands
 cd tabbycat
+
+# Migrate (can't do it during build; no db connnection)
 python ./manage.py migrate --no-input
+
+# Run the server
+# python ./manage.py runserver 0.0.0.0:8000
 waitress-serve --threads=12 --host=0.0.0.0 --port=8000 wsgi:application

docker-compose.yml

@@ -25,6 +25,8 @@ services:
     command: ["./bin/docker-wait.sh", "db:5432", "--", "./bin/docker-run.sh"]
     depends_on:
       - db
+    expose:
+      - "8000"
     environment:
       - DEBUG=1
       - IN_DOCKER=1
@@ -33,5 +35,7 @@ services:
       - "8000:8000"
     volumes:
       - .:/tcd
+      - node_modules:/tcd/node_modules
 volumes:
   pgdata:
+  node_modules:

docs/install/docker.rst

@@ -41,6 +41,6 @@ Docker offers a installer for Windows and OSX. Go to the relevant page linked be
 
 3. A terminal window should popup and bunch of text scroll by. If this is your first time running Docker it may take up to half an hour to download and setup the virtul machine.
 
-4. Once the new text stops being added you should be able to go to a web and open up http://0.0.0.0:8000 and see your new Tabbycat website.
+4. Once the new text stops being added you should be able to go to a web and open up http://localhost:8000/ (Windows) or http://0.0.0.0:8000 (OSX/Linux) and see your new Tabbycat website.
 
-  .. note:: If you want to reopen Tabbycat at a later time (say after restarting) repeat steps 1 through 3 here.
+  .. note:: If you want to reopen Tabbycat at a later time (say after restarting) repeat steps 1 through 3 here.