Revert f4973e9280e2604a426767e9eca4f698e0cad5b3 since we can't use Rails at this...

[discourse_docker.git] / image / base / Dockerfile

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index 1a77fabf4d55bf7577d9f53817b79721f04b6886..29c570fd1bf74ed1a3d33493f0312de87aa5a7ab 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -47,8 +47,7 @@ RUN cd / &&\
     locale-gen en_US &&\
     apt-get install -y nodejs &&\
     npm install -g uglify-js@"<3" &&\
-    npm install -g svgo &&\
-    npm install -g prettier@1.14.0
+    npm install -g svgo
 
 ADD install-nginx /tmp/install-nginx
 RUN /tmp/install-nginx
@@ -138,6 +137,5 @@ RUN useradd discourse -s /bin/bash -m -U &&\
     git remote set-branches --add origin tests-passed &&\
     chown -R discourse:discourse /var/www/discourse &&\
     cd /var/www/discourse &&\
-    sudo -u discourse bundle install --deployment \
-         --without test --without development &&\
+    sudo -u discourse bundle install --deployment --without test --without development &&\
     find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +