tweaks required to get this to build... ruby now needs ruby to install ruby

[discourse_docker.git] / image / discourse_dev / Dockerfile

diff --git a/image/discourse_dev/Dockerfile b/image/discourse_dev/Dockerfile
index 99d2122536348f806bf0ecc63f3f8a3a129a076e..c8b36231230ad4a984bf4826de44475a3296940f 100644 (file)
--- a/image/discourse_dev/Dockerfile
+++ b/image/discourse_dev/Dockerfile
@@ -1,17 +1,15 @@
 # NAME:     discourse/discourse_dev
-# VERSION:  1.3.10
-FROM discourse/base:1.3.10
+# VERSION:  release
+FROM discourse/base:release
 
-MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
+#LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\""
 
 # Install for mailcatcher gem
 RUN apt-get update && apt-get install -y libsqlite3-dev \
     && gem install mailcatcher && rm -rf /var/lib/apt/lists/*
 
-# Create discourse user and /var/www location for both
-# discourse and dev images.
-RUN useradd discourse -s /bin/bash -m -U &&\
-    mkdir -p /var/www
+# Remove the code added on base image
+RUN rm -rf /var/www/*
 
 # Give discourse user no-passwd sudo permissions (for bundle install)
 ADD sudoers.discourse /etc/sudoers.d/discourse
@@ -39,3 +37,12 @@ RUN mv /shared/postgres_data /shared/postgres_data_orig
 # re-instantiate data on boot if needed (this will allow it to persist across
 # invocations when used with a mounted volume)
 ADD ensure-database /etc/runit/1.d/ensure-database
+
+RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add - &&\
+    echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list &&\
+    curl -sL https://deb.nodesource.com/setup_9.x | sudo -E bash - &&\
+    apt-get update &&\
+    apt-get install -y google-chrome-stable yarn nodejs &&\
+    npm install -g eslint babel-eslint