Merge pull request #40 from vlesierse/dnx-rename

Renamed the nightly image to DNX

Author: ahmetb

1.0.0-beta2/README.md

@@ -19,11 +19,18 @@ Please [read this article][webdev-article] on .NET Web Development and Tools Blo
 
 This image provides the following environment variables:
 
-* `KRE_USER_HOME`: path to KRE installation (e.g. /opt/kre)
+* `KRE_USER_HOME`: path to KRE installation (e.g. /opt/kre) (except the `nightly` image)
 * `KRE_VERSION`: version of KRE (K Runtime) installed (except the `nightly` image)
 
 In addition to these, `PATH` is set to include the `k`/`kpm` executables.
 
+The `nightly` image provides the following environment variables:
+
+* `DNX_USER_HOME`: path to DNX installation (e.g. /opt/dnx)
+* `DNX_FEED`: url to the DNX nightly feed (e.g. https://www.myget.org/F/aspnetvnext/api/v2)
+
+In addition to these, `PATH` is set to include the `dnx`/`k`/`kpm` executables.
+
 ## Build Status
 
 Status for image tags built from `master`: [![Build Status of Docker Image on Circle CI](https://circleci.com/gh/aspnet/aspnet-docker/tree/master.svg?style=svg)](https://circleci.com/gh/aspnet/aspnet-docker/tree/master)

nightly/Dockerfile

@@ -1,14 +1,14 @@
 FROM mono:3.12
 
-ENV KRE_FEED https://www.myget.org/F/aspnetvnext/api/v2
-ENV KVM_USER_HOME /opt/k
+ENV DNX_FEED https://www.myget.org/F/aspnetvnext/api/v2
+ENV DNX_USER_HOME /opt/dnx
 
 RUN apt-get -qq update && apt-get -qqy install unzip
 
-ONBUILD RUN curl -sSL https://raw.githubusercontent.com/aspnet/Home/release/kvminstall.sh | KRE_USER_HOME=$KVM_USER_HOME KVM_BRANCH=dev sh
-ONBUILD RUN bash -c "source $KVM_USER_HOME/kvm/kvm.sh \
-	&& kvm install latest -a default \
-	&& kvm alias default | xargs -i ln -s $KVM_USER_HOME/runtimes/{} $KVM_USER_HOME/runtimes/default"
+ONBUILD RUN curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | DNX_BRANCH=dev sh
+ONBUILD RUN bash -c "source $DNX_USER_HOME/dnvm/dnvm.sh \
+	&& dnvm install latest -a default \
+	&& dnvm alias default | xargs -i ln -s $DNX_USER_HOME/runtimes/{} $DNX_USER_HOME/runtimes/default"
 
 # Install libuv for Kestrel from source code (binary is not in wheezy and one in jessie is still too old)
 RUN apt-get -qqy install \
@@ -26,4 +26,4 @@ RUN LIBUV_VERSION=1.0.0-rc2 \
 COPY NuGet.Config /tmp/
 RUN mkdir -p $HOME/.config/NuGet/ && mv /tmp/NuGet.Config $HOME/.config/NuGet/
 
-ENV PATH $PATH:$KVM_USER_HOME/runtimes/default/bin
+ENV PATH $PATH:$DNX_USER_HOME/runtimes/default/bin