From 48df62aaccacda6816b1cb13ae8a6c5637dd4e26 Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Thu, 3 Sep 2015 20:12:39 +0100 Subject: [PATCH 1/7] added beta 7 coreclr dockerfile --- 1.0.0-beta7-coreclr/Dockerfile | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 1.0.0-beta7-coreclr/Dockerfile diff --git a/1.0.0-beta7-coreclr/Dockerfile b/1.0.0-beta7-coreclr/Dockerfile new file mode 100644 index 00000000..04824c4a --- /dev/null +++ b/1.0.0-beta7-coreclr/Dockerfile @@ -0,0 +1,25 @@ +FROM debian:wheezy + +ENV DNX_VERSION 1.0.0-beta7 +ENV DNX_USER_HOME /opt/dnx + +RUN apt-get -qq update && apt-get -qqy install unzip curl + +RUN curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | DNX_USER_HOME=$DNX_USER_HOME DNX_BRANCH=v$DNX_VERSION sh +RUN bash -c "source $DNX_USER_HOME/dnvm/dnvm.sh \ + && dnvm upgrade -r coreclr" + +# 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.4.2 \ + && curl -sSL https://github.com/libuv/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:$DNX_USER_HOME/runtimes/default/bin From 7b08f1106ee29a9bc31d0f924dcf9c7a2c6e8abb Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Thu, 3 Sep 2015 20:26:43 +0100 Subject: [PATCH 2/7] added libunwind8, gettext, libssl-dev, libcurl3-dev, zlib1g to dockerfile --- 1.0.0-beta7-coreclr/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.0.0-beta7-coreclr/Dockerfile b/1.0.0-beta7-coreclr/Dockerfile index 04824c4a..a050c9ab 100644 --- a/1.0.0-beta7-coreclr/Dockerfile +++ b/1.0.0-beta7-coreclr/Dockerfile @@ -3,7 +3,7 @@ FROM debian:wheezy ENV DNX_VERSION 1.0.0-beta7 ENV DNX_USER_HOME /opt/dnx -RUN apt-get -qq update && apt-get -qqy install unzip curl +RUN apt-get -qq update && apt-get -qqy install unzip curl libunwind8 gettext libssl-dev libcurl3-dev zlib1g RUN curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | DNX_USER_HOME=$DNX_USER_HOME DNX_BRANCH=v$DNX_VERSION sh RUN bash -c "source $DNX_USER_HOME/dnvm/dnvm.sh \ From dd8efcbb4e6bc50dc30af318cfc329f5cac7c1ae Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Thu, 3 Sep 2015 20:41:03 +0100 Subject: [PATCH 3/7] changed to use jessie debian image as recommended by @akoeplinger. If it all goes wrong its all his fault :) --- 1.0.0-beta7-coreclr/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.0.0-beta7-coreclr/Dockerfile b/1.0.0-beta7-coreclr/Dockerfile index a050c9ab..bbca438b 100644 --- a/1.0.0-beta7-coreclr/Dockerfile +++ b/1.0.0-beta7-coreclr/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:wheezy +FROM debian:jessie ENV DNX_VERSION 1.0.0-beta7 ENV DNX_USER_HOME /opt/dnx From fe975285e0ef0f68b9bd2166a7479e23a0ef2340 Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Thu, 3 Sep 2015 23:03:48 +0100 Subject: [PATCH 4/7] removed 'coreclr' in build-app-image version variable --- .ci/build-app-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build-app-image.sh b/.ci/build-app-image.sh index 12a31f1f..c42a1295 100755 --- a/.ci/build-app-image.sh +++ b/.ci/build-app-image.sh @@ -12,7 +12,7 @@ BASE_IMAGE=$1 TEST_APP=$2 TAG=$3 VERSION=$4 - +VERSION= echo $VERSION | sed -e "s/-coreclr//" echo "[CI] Injecting Dockerfile to project $TEST_APP..." if [[ ! -d $SAMPLES_REPO/samples/$VERSION/$TEST_APP ]]; then From 48b936a052f210bfb7f59ff1c6e617b5a783828e Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Thu, 3 Sep 2015 23:15:12 +0100 Subject: [PATCH 5/7] added missing $ bash syntax in build-app-image version variable --- .ci/build-app-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/build-app-image.sh b/.ci/build-app-image.sh index c42a1295..46c41b53 100755 --- a/.ci/build-app-image.sh +++ b/.ci/build-app-image.sh @@ -12,7 +12,7 @@ BASE_IMAGE=$1 TEST_APP=$2 TAG=$3 VERSION=$4 -VERSION= echo $VERSION | sed -e "s/-coreclr//" +VERSION=$(echo $VERSION | sed -e "s/-coreclr//") echo "[CI] Injecting Dockerfile to project $TEST_APP..." if [[ ! -d $SAMPLES_REPO/samples/$VERSION/$TEST_APP ]]; then From 527406392d74799edb7a2214e8b57abb96f12ae7 Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Thu, 3 Sep 2015 23:49:22 +0100 Subject: [PATCH 6/7] updated README and build-app-image to use better coreclr variable string replace --- .ci/build-app-image.sh | 6 +++--- 1.0.0-beta7/README.md | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.ci/build-app-image.sh b/.ci/build-app-image.sh index 46c41b53..37c761ab 100755 --- a/.ci/build-app-image.sh +++ b/.ci/build-app-image.sh @@ -12,14 +12,14 @@ BASE_IMAGE=$1 TEST_APP=$2 TAG=$3 VERSION=$4 -VERSION=$(echo $VERSION | sed -e "s/-coreclr//") +SAMPLE=$SAMPLES_REPO/samples/${VERSION%-coreclr}/$TEST_APP echo "[CI] Injecting Dockerfile to project $TEST_APP..." -if [[ ! -d $SAMPLES_REPO/samples/$VERSION/$TEST_APP ]]; then +if [[ ! -d $SAMPLE ]]; then echo "[CI] Sample '$TEST_APP' not found for Docker image '$VERSION'" exit 1 fi -cd $SAMPLES_REPO/samples/$VERSION/$TEST_APP +cd $SAMPLE ls -al diff --git a/1.0.0-beta7/README.md b/1.0.0-beta7/README.md index 5a4828ba..d362b6cb 100644 --- a/1.0.0-beta7/README.md +++ b/1.0.0-beta7/README.md @@ -14,6 +14,7 @@ This project is part of ASP.NET 5. You can find samples, documentation, and gett ## Supported tags * [`1.0.0-beta7`, `latest` _(1.0.0-beta7/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta7/Dockerfile) +* [`1.0.0-beta7`, `coreclr` _(1.0.0-beta7/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta7-coreclr/Dockerfile) * [`1.0.0-beta6`, _(1.0.0-beta6/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta6/Dockerfile) * [`1.0.0-beta5`, _(1.0.0-beta5/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta5/Dockerfile) * [`1.0.0-beta4`, _(1.0.0-beta4/Dockerfile)_](https://github.com/aspnet/aspnet-docker/blob/master/1.0.0-beta4/Dockerfile) From 7dfc61089d6efeafaaa1bb78f5a9977cf7d775d0 Mon Sep 17 00:00:00 2001 From: Jonathan Channon Date: Fri, 4 Sep 2015 14:23:54 +0100 Subject: [PATCH 7/7] reset dnvm installation to same as beta7 but added -r coreclr --- 1.0.0-beta7-coreclr/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/1.0.0-beta7-coreclr/Dockerfile b/1.0.0-beta7-coreclr/Dockerfile index bbca438b..83ad2d36 100644 --- a/1.0.0-beta7-coreclr/Dockerfile +++ b/1.0.0-beta7-coreclr/Dockerfile @@ -7,7 +7,9 @@ RUN apt-get -qq update && apt-get -qqy install unzip curl libunwind8 gettext lib RUN curl -sSL https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.sh | DNX_USER_HOME=$DNX_USER_HOME DNX_BRANCH=v$DNX_VERSION sh RUN bash -c "source $DNX_USER_HOME/dnvm/dnvm.sh \ - && dnvm upgrade -r coreclr" + && dnvm install $DNX_VERSION -a default -r coreclr \ + && 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 \