Fixes for Docker build

JosueCustodio · Sep 6, 2018 · 2e81ed1 · 2e81ed1
1 parent a7f12f4
commit 2e81ed1
Show file tree

Hide file tree

Showing 4 changed files with 195 additions and 32 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,10 +22,10 @@ ADD . /tcd/
 RUN git config --global url."https://".insteadOf git://
 
 # Install our node/python requirements
+RUN npm install -g [email protected]
 RUN pip install -r ./config/requirements_core.txt
-RUN npm install
+RUN npm install --only=production
 
 # Compile all the static files
-RUN npm rebuild node-sass --force
 RUN npm run build
 RUN python ./tabbycat/manage.py collectstatic --noinput -v 0
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -30,7 +30,6 @@ services:
     environment:
       - DEBUG=1
       - IN_DOCKER=1
-    image: django
     ports:
       - "8000:8000"
     volumes:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "jquery": "^3.3.0",
     "jquery-validation": "~1.17.0",
     "jsbarcode": "^3.8.0",
-    "lodash": "^4.17.5",
+    "lodash": "^4.17.10",
     "node-sass": "^4.9.3",
     "npm-run-all": "^4.1.3",
     "popper.js": "^1.14.4",
@@ -60,7 +60,7 @@
     "lint-sass": "stylelint --cache \"tabbycat/templates/scss/**/*.scss\""
   },
   "devDependencies": {
-    "artillery": "^1.6.0-22",
+    "artillery": "^1.6.0-23",
     "livereload": "^0.7.0",
     "stylelint": "^9.x",
     "stylelint-config-standard": "^18.x",