Use nvm, node v6.111.5, drop haskell & boost support, update dependen…

…cies & a readme.

.bash_ext

@@ -70,7 +70,3 @@ alias e=emacs
 
 # Start session in project directory
 cd /code
-
-###############################################################################
-# AUTO_COMPLETION
-eval "$(stack --bash-completion-script stack)"

Dockerfile.m4

@@ -1,5 +1,3 @@
-# -*-dockerfile-*-
-
 # This file is preprocessed by m4. Use make build to build docker image.
 # All imported files can be found in ./modules directory.
 
@@ -10,12 +8,10 @@ include(tool/essentials.docker)
 # Languages
 include(lang/python.docker)
 include(lang/cpp.docker)
-include(lang/haskell.docker)
 include(lang/go.docker)
 include(lang/javascript.docker)
 
 # Tools
-include(tool/spacemacs.docker)
 include(tool/thefuck.docker)
 include(tool/gcloud.docker)
 include(tool/polymer.docker)

Makefile

@@ -1,5 +1,5 @@
 NS = merlinnot
-REPO = dev
+REPO = devver
 VERSION ?= latest
 
 .PHONY: dockerfile build push

README.md

@@ -37,27 +37,13 @@ $ docker-compose port dev [port_number]
 - Python v3.5.2
 - GNU Compiler Collection v5.4.0 20160609
 - Clang v3.8.0-2ubuntu4
-- Go v1.8.1
-- The Glorious Glasgow Haskell Compilation System v8.0.2
-- Node.js v7 (current)
+- Go v1.9.2
+- Node.js v6.11.5 (nvm)
 - Perl v5.22.1
 - GNU bash v4.3.46
 
 ### Frameworks, libraries and language-specific tools
 
-C++:
-- [Boost v1.63.0](http://www.boost.org)
-
-Haskell:
-- [Stack](https://docs.haskellstack.org/en/stable/README/)
-- [apply-refact](https://hackage.haskell.org/package/apply-refact)
-- [hlint](https://hackage.haskell.org/package/hlint)
-- [stylish-haskell](https://hackage.haskell.org/package/stylish-haskell)
-- [hasktags](https://hackage.haskell.org/package/hasktags)
-- [hoogle](https://hackage.haskell.org/package/hoogle)
-- [intero](https://hackage.haskell.org/package/intero)
-- [hindent](https://hackage.haskell.org/package/hindent)
-
 Go:
 - [gocode](https://github.com/nsf/gocode)
 - [godef](https://github.com/rogpeppe/godef)
@@ -70,7 +56,6 @@ Go:
 - [Goole App Engine package](google.golang.org/appengine)
 
 JavaScript:
-- [Tern](https://ternjs.net)
 - [JS Beautifier](https://github.com/beautify-web/js-beautify)
 - [ESLint](http://eslint.org)
 - [Yarn](https://github.com/yarnpkg/yarn)
@@ -93,7 +78,6 @@ JavaScript:
 - [gcloud Beta Commands](https://cloud.google.com/sdk/)
 - [gcloud app Python Extensions](https://cloud.google.com/sdk/)
 - [kubectl](http://kubernetes.io/docs/user-guide/kubectl-overview/)
-- [Ngrok](https://ngrok.com)
 - [The Fuck](https://github.com/nvbn/thefuck)
 - [Firebase CLI](https://github.com/firebase/firebase-tools)
 - [Polymer CLI](https://www.polymer-project.org/)
@@ -103,27 +87,22 @@ JavaScript:
   Plugins:  
     - [Auto Rename Tag v0.0.14](https://marketplace.visualstudio.com/items?itemName=formulahendry.auto-rename-tag)
     - [change-case v1.0.0](https://marketplace.visualstudio.com/items?itemName=wmaurer.change-case) 
-    - [Color Highlight v2.2.0](https://marketplace.visualstudio.com/items?itemName=naumovs.color-highlight)
-    - [Docker v0.0.16](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker)
-    - [ESLint v1.2.11](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
-    - [Git Blame v1.11.3](https://marketplace.visualstudio.com/items?itemName=waderyan.gitblame)
-    - [Git History v0.2.1](https://marketplace.visualstudio.com/items?itemName=donjayamanne.githistory)
+    - [Color Highlight v2.3.0](https://marketplace.visualstudio.com/items?itemName=naumovs.color-highlight)
+    - [Docker v0.0.22](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker)
+    - [ESLint v1.4.3](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+    - [Git Blame v2.2.0](https://marketplace.visualstudio.com/items?itemName=waderyan.gitblame)
+    - [Git History v0.2.3](https://marketplace.visualstudio.com/items?itemName=donjayamanne.githistory)
     - [gitignore v0.5.0](https://marketplace.visualstudio.com/items?itemName=codezombiech.gitignore)
-    - [Haskelly v0.4.21](https://marketplace.visualstudio.com/items?itemName=UCL.haskelly)
     - [HTML Snippets v0.1.0](https://marketplace.visualstudio.com/items?itemName=abusaidm.html-snippets)
-    - [JavaScript (ES6) snippets v1.4.1](https://marketplace.visualstudio.com/items?itemName=xabikos.JavaScriptSnippets)
+    - [JavaScript (ES6) snippets v1.5.0](https://marketplace.visualstudio.com/items?itemName=xabikos.JavaScriptSnippets)
     - [JavaScript Snippet pack v0.1.5](https://marketplace.visualstudio.com/items?itemName=akamud.vscode-javascript-snippet-pack)
     - [npm Intellisense v1.3.0](https://marketplace.visualstudio.com/items?itemName=christian-kohler.npm-intellisense)
-    - [npm v0.2.0](https://marketplace.visualstudio.com/items?itemName=eg2.vscode-npm-script)
+    - [npm v0.3.3](https://marketplace.visualstudio.com/items?itemName=eg2.vscode-npm-script)
     - [Path Intellisense v1.4.2](https://marketplace.visualstudio.com/items?itemName=christian-kohler.path-intellisense)
-    - [Polymer IDE v0.5.0](https://github.com/Polymer/vscode-plugin)
-    - [React Redux ES6 Snippets v2.0.2](https://marketplace.visualstudio.com/items?itemName=timothymclane.react-redux-es6-snippets)
-    - [Reactjs code snippets v1.4.0](https://marketplace.visualstudio.com/items?itemName=xabikos.ReactSnippets)
-    - [Relative Path v0.12.0](https://marketplace.visualstudio.com/items?itemName=jakob101.RelativePath)
-    - [REST Client v0.14.2](https://marketplace.visualstudio.com/items?itemName=humao.rest-client)
-    - [Sass v1.4.1](https://marketplace.visualstudio.com/items?itemName=robinbentley.sass-indented)
-    - [SVG Viewer v1.4.2](https://marketplace.visualstudio.com/items?itemName=cssho.vscode-svgviewer)
-    - [TSLint v0.16.0](https://marketplace.visualstudio.com/items?itemName=eg2.tslint)
+    - [Polymer IDE v0.6.0](https://github.com/Polymer/vscode-plugin)
+    - [Relative Path v1.0.0](https://marketplace.visualstudio.com/items?itemName=jakob101.RelativePath)
+    - [SVG Viewer v1.4.3](https://marketplace.visualstudio.com/items?itemName=cssho.vscode-svgviewer)
+    - [TSLint v1.0.24](https://marketplace.visualstudio.com/items?itemName=eg2.tslint)
     - [VSCode Dimmer v2.1.0](https://marketplace.visualstudio.com/items?itemName=hoovercj.vscode-dimmer)
 
 ### Tips and tricks

modules/core.docker

@@ -11,6 +11,9 @@ ENV DEVVER_VERSION=${version}
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
 
+# Replace shell with bash so we can source files
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+
 # Update image
 RUN apt-get -qq update && apt-get -qq upgrade -y -o \
       Dpkg::Options::="--force-confold"

modules/lang/cpp.docker

@@ -3,18 +3,3 @@
 RUN apt-get install -y --no-install-recommends \
       build-essential \
       clang
-RUN BOOST_MAJOR=1 && \
-    BOOST_MINOR=64 && \
-    BOOST_PATCH=0 && \
-    BOOST_BASE_URL="http://sourceforge.net/projects/boost/files/boost/" && \
-    BOOST_VERSION_DIR="${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH}/" && \
-    BOOST_PKG="boost_${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}.tar.bz2" && \
-    wget -c \
-      "${BOOST_BASE_URL}${BOOST_VERSION_DIR}${BOOST_PKG}/download" \
-      --directory-prefix=/tmp/boost/ && \
-    mkdir /tmp/boost/extracted && \
-    tar -xf /tmp/boost/download -C /tmp/boost/extracted/ && \
-    cd /tmp/boost/extracted/boost_1_${BOOST_MINOR}_0 && \
-    ./bootstrap.sh --prefix=/usr/local/ && \
-    ./b2 -d0 install && \
-    rm -r /tmp/boost

modules/lang/go.docker

@@ -1,7 +1,7 @@
 # -*-dockerfile-*-
 
 # Install Go
-RUN GO_VERSION="1.9.1" && \
+RUN GO_VERSION="1.9.2" && \
     GO_BASE_URL="https://storage.googleapis.com/golang/" && \
     wget -q ${GO_BASE_URL}go${GO_VERSION}.linux-amd64.tar.gz && \
     tar -xf go${GO_VERSION}.linux-amd64.tar.gz && \

modules/lang/javascript.docker

@@ -1,15 +1,19 @@
 # -*-dockerfile-*-
 
 # Install Node
-RUN NODE_VERSION="8" && \ 
-    curl -sL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash && \
-    apt-get install -y --no-install-recommends nodejs
+RUN curl -o- \
+  https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
+RUN . ${HOME}/.nvm/nvm.sh && \
+    nvm install 6.11.5 && \
+    nvm use 6.11.5
 
-# Install essential packages
-RUN npm install --global \
-      eslint \
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | \
+      tee /etc/apt/sources.list.d/yarn.list && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends yarn
+RUN . ${HOME}/.nvm/nvm.sh && \
+    yarn global add \
       gulp-cli \
       tern \
-      tslint \
-      typescript \
-      yarn
+      typescript

modules/tool/firebase.docker

@@ -2,6 +2,7 @@
 
 # Install Firebase CLI
 
-RUN yarn global add \
+RUN . ${HOME}/.nvm/nvm.sh && \
+    yarn global add \
       firebase-tools \
       firebase-bolt

modules/tool/polymer.docker

@@ -2,7 +2,8 @@
 
 # Install Polymer CLI and tools
 
-RUN yarn global add \
+RUN . ${HOME}/.nvm/nvm.sh && \
+    yarn global add \
       polymer-cli \
       polymer-analyzer \
       bower && \

modules/tool/vscode/extensions.sh

@@ -26,21 +26,16 @@ vsext christian-kohler npm-intellisense 1.3.0
 vsext christian-kohler path-intellisense 1.4.2
 vsext codezombiech gitignore 0.5.0
 vsext cssho vscode-svgviewer 1.4.3
-vsext dbaeumer vscode-eslint 1.3.2
+vsext dbaeumer vscode-eslint 1.4.3
 vsext donjayamanne githistory 0.2.3
-vsext eg2 vscode-npm-script 0.2.1
-vsext eg2 tslint 1.0.9
-vsext formulahendry auto-rename-tag 0.0.14
+vsext eg2 vscode-npm-script 0.3.3
+vsext eg2 tslint 1.0.24
+vsext formulahendry auto-rename-tag 0.0.15
 vsext hoovercj vscode-dimmer 2.1.0
-vsext humao rest-client 0.15.3
 vsext jakob101 RelativePath 1.0.0
 vsext naumovs color-highlight 2.3.0
-vsext PeterJausovec vscode-docker 0.0.18
+vsext PeterJausovec vscode-docker 0.0.22
 vsext polymer polymer-ide 0.6.0
-vsext robinbentley sass-indented 1.4.2
-vsext timothymclane react-redux-es6-snippets 2.1.0
-vsext UCL haskelly 0.4.26
 vsext waderyan gitblame 2.2.0
 vsext wmaurer change-case 1.0.0
 vsext xabikos JavaScriptSnippets 1.5.0
-vsext xabikos ReactSnippets 1.4.0