feat(node): rename yarn to nodejs image and add npm support

README.md

@@ -13,7 +13,7 @@ See README: https://github.com/whatwedo/docker-base-images/
 | `whatwedo/nginx-php` | nginx web server and PHP-FPM |
 | `whatwedo/php` | PHP interpreter |
 | `whatwedo/symfony` | Symfony image based on nginx and PHP-FPM |
-| `whatwedo/yarn` | yarn package manager |
+| `whatwedo/nodejs` | NodeJS, npm and yarn v1 |
 
 
 ## Usage
@@ -119,13 +119,6 @@ The following custom setting were made
 [nginx](https://www.nginx.com/) is configured to use it with PHP sites using PHP-FPM. Place your site in `/var/www` to serve it. 
 
 
-### yarn
-
-(only installed if you are using `whatwedo/yarn`)
-
-[yarn](https://yarnpkg.com) is a fast and reliable JavaScript package manager. 
-
-
 ## Upstart
 
 The default command (`CMD`) of this image is set to `/sbin/upstart`. `/sbin/upstart` provides a simple init logic. You are able to place one or multiple scripts in the `/etc/upstart` directory. These scripts are going to be automatically executed in alphabetical order at the container startup. After running all scripts, `/sbin/upstart` will trigger the runit execution.

build_order

@@ -1,6 +1,6 @@
 base
 php
-yarn
+nodejs
 nginx
 nginx-php
 symfony

images/nodejs/Dockerfile

@@ -0,0 +1,9 @@
+ARG VERSION
+FROM whatwedo/base:$VERSION
+
+# Add rootfs files
+COPY ./rootfs /
+
+# note: git and openssh-client is needed to 
+# install packages directly from a repository
+RUN apk add --no-cache nodejs npm yarn git openssh-client

images/yarn/rootfs/etc/goss/conf.d/yarn.yaml → images/nodejs/rootfs/etc/goss/conf.d/nodejs.yaml

@@ -3,3 +3,5 @@ command:
         exit-status: 0
     yarn -v:
         exit-status: 0
+    npm -v:
+        exit-status: 0