From 7f028a3725aeed029dd940900c7072cc3bd29092 Mon Sep 17 00:00:00 2001 From: Michael Friis Date: Fri, 13 Mar 2015 14:55:32 -0700 Subject: [PATCH] Add support for beta3 --- 1.0.0-beta3/Dockerfile | 26 ++++++++++++++++++++++++++ {1.0.0-beta2 => 1.0.0-beta3}/README.md | 7 ++++--- README.md | 2 +- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 1.0.0-beta3/Dockerfile rename {1.0.0-beta2 => 1.0.0-beta3}/README.md (81%) diff --git a/1.0.0-beta3/Dockerfile b/1.0.0-beta3/Dockerfile new file mode 100644 index 00000000..83f1bd9f --- /dev/null +++ b/1.0.0-beta3/Dockerfile @@ -0,0 +1,26 @@ +FROM mono:3.12 + +ENV KRE_VERSION 1.0.0-beta3 +ENV KVM_USER_HOME /opt/kre + +RUN apt-get -qq update && apt-get -qqy install unzip + +RUN curl -sSL https://raw.githubusercontent.com/aspnet/Home/release/kvminstall.sh | KRE_USER_HOME=$KVM_USER_HOME KVM_BRANCH=v$KRE_VERSION sh +RUN bash -c "source $KVM_USER_HOME/kvm/kvm.sh \ + && kvm install $KRE_VERSION -a default \ + && kvm alias default | xargs -i ln -s $KVM_USER_HOME/runtimes/{} $KVM_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 \ + autoconf \ + automake \ + build-essential \ + libtool +RUN LIBUV_VERSION=1.0.0-rc2 \ + && curl -sSL https://github.com/joyent/libuv/archive/v${LIBUV_VERSION}.tar.gz | tar zxfv - -C /usr/local/src \ + && cd /usr/local/src/libuv-$LIBUV_VERSION \ + && sh autogen.sh && ./configure && make && make install \ + && rm -rf /usr/local/src/libuv-$LIBUV_VERSION \ + && ldconfig + +ENV PATH $PATH:$KVM_USER_HOME/runtimes/default/bin diff --git a/1.0.0-beta2/README.md b/1.0.0-beta3/README.md similarity index 81% rename from 1.0.0-beta2/README.md rename to 1.0.0-beta3/README.md index 826bfd7a..82100ab4 100644 --- a/1.0.0-beta2/README.md +++ b/1.0.0-beta3/README.md @@ -9,7 +9,8 @@ This project is part of ASP.NET 5. You can find samples, documentation, and gett ## Supported tags -* [`1.0.0-beta2`, `latest` _(1.0.0-beta2/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta2/Dockerfile) +* [`1.0.0-beta3`, `latest` _(1.0.0-beta3/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta3/Dockerfile) +* [`1.0.0-beta2`, _(1.0.0-beta2/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta2/Dockerfile) * [`1.0.0-beta1` _(1.0.0-beta1/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta1/Dockerfile) * [`nightly` _(nightly/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/nightly/Dockerfile) @@ -19,8 +20,8 @@ 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) (except the `nightly` image) -* `KRE_VERSION`: version of KRE (K Runtime) installed (except the `nightly` image) +* `KVM_USER_HOME`: path to KRE installation (e.g. /opt/kre) +* `KRE_VERSION`: version of KRE (K Runtime) installed In addition to these, `PATH` is set to include the `k`/`kpm` executables. diff --git a/README.md b/README.md index 622317e0..8705d30a 120000 --- a/README.md +++ b/README.md @@ -1 +1 @@ -1.0.0-beta2/README.md \ No newline at end of file +1.0.0-beta3/README.md \ No newline at end of file