Fix loading order for versioning in the Node provider

As required for the upcoming feature of Provider versions on Dockbit:
Loading versions from .node-version via avn should override the version
used in the Dockbit provider.

This fix loads the Node version required in the Provider configuration
only if no .node-version exists (hence avn isn't loaded).

Author: 0xAhmed

CHANGELOG.md

@@ -3,6 +3,10 @@ All changes to the images, whether it's a new image or an update will be added h
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+## [Unreleased]
+### Fixed 
+- Fix loading order of Node provider versions.
+
 ## 2017-03-04
 ### Changed
-- Updated [Packer image](packer/) to use [Packer](http://packer.io/) version 0.12.3.
+- Updated [Packer image](packer/) to use [Packer](http://packer.io/) version 0.12.3.

node/0.10.46/Dockerfile

@@ -1,9 +1,6 @@
 FROM dockbit/base:latest
 MAINTAINER The Dockbit Team "[email protected]"
 
-RUN . $HOME/.bash_profile \
- && nvm use 0.10.46
-
 # Execution environment
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]

node/0.10.46/docker-entrypoint.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 source /bin/dockbit_bootstrap.sh
 
+# if avn/.node-version isn't involved, load the required version with nvm use
+if [ -z "$__avn_active_file" ]; then
+  nvm use 0.10.46
+fi
+
 # Compose a string of which node dependencies to track
 if [ -f package.json ];  then node_dependencies="-f package.json";                     fi
 if [ -f .node-version ]; then node_dependencies="$node_dependencies -f .node-version"; fi

node/0.12.15/Dockerfile

@@ -1,9 +1,6 @@
 FROM dockbit/base:latest
 MAINTAINER The Dockbit Team "[email protected]"
 
-RUN . $HOME/.bash_profile \
- && nvm use 0.12.15
-
 # Execution environment
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]

node/0.12.15/docker-entrypoint.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 source /bin/dockbit_bootstrap.sh
 
+# if avn/.node-version isn't involved, load the required version with nvm use
+if [ -z "$__avn_active_file" ]; then
+  nvm use 0.12.15
+fi
+
 # Compose a string of which node dependencies to track
 if [ -f package.json ];  then node_dependencies="-f package.json";                     fi
 if [ -f .node-version ]; then node_dependencies="$node_dependencies -f .node-version"; fi

node/5.12.0/Dockerfile

@@ -1,9 +1,6 @@
 FROM dockbit/base:latest
 MAINTAINER The Dockbit Team "[email protected]"
 
-RUN . $HOME/.bash_profile \
- && nvm use 5.12.0
-
 # Execution environment
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]

node/5.12.0/docker-entrypoint.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 source /bin/dockbit_bootstrap.sh
 
+# if avn/.node-version isn't involved, load the required version with nvm use
+if [ -z "$__avn_active_file" ]; then
+  nvm use 5.12.0
+fi
+
 # Compose a string of which node dependencies to track
 if [ -f package.json ];  then node_dependencies="-f package.json";                     fi
 if [ -f .node-version ]; then node_dependencies="$node_dependencies -f .node-version"; fi

node/6.5.0/Dockerfile

@@ -1,9 +1,6 @@
 FROM dockbit/base:latest
 MAINTAINER The Dockbit Team "[email protected]"
 
-RUN . $HOME/.bash_profile \
- && nvm use 6.5.0
-
 # Execution environment
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]

node/6.5.0/docker-entrypoint.sh

@@ -1,6 +1,11 @@
 #!/bin/bash
 source /bin/dockbit_bootstrap.sh
 
+# if avn/.node-version isn't involved, load the required version with nvm use
+if [ -z "$__avn_active_file" ]; then
+  nvm use 6.5.0
+fi
+
 # Compose a string of which node dependencies to track
 if [ -f package.json ];  then node_dependencies="-f package.json";                     fi
 if [ -f .node-version ]; then node_dependencies="$node_dependencies -f .node-version"; fi

node/6.8.0/Dockerfile

@@ -1,9 +1,6 @@
 FROM dockbit/base:latest
 MAINTAINER The Dockbit Team "[email protected]"
 
-RUN . $HOME/.bash_profile \
- && nvm use 6.8.0
-
 # Execution environment
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]