Skip to content
This repository has been archived by the owner on May 31, 2019. It is now read-only.

Commit

Permalink
Update for 1.1.1/1.0.4. Remove project.json images
Browse files Browse the repository at this point in the history
Update packagecache to use the "Feburary 2017" patch release
Update crossgen caches
Update README.md examples
  • Loading branch information
Nate McMaster committed Mar 1, 2017
1 parent 708206d commit 8e43b77
Show file tree
Hide file tree
Showing 24 changed files with 480 additions and 934 deletions.
58 changes: 0 additions & 58 deletions 1.0/jessie/build-projectjson/Dockerfile

This file was deleted.

8 changes: 0 additions & 8 deletions 1.0/jessie/build-projectjson/hooks/post_push

This file was deleted.

129 changes: 0 additions & 129 deletions 1.0/jessie/build-projectjson/packagescache.project.json

This file was deleted.

23 changes: 12 additions & 11 deletions 1.0/jessie/runtime/Dockerfile
@@ -1,14 +1,15 @@
# base
FROM microsoft/dotnet:1.0.3-runtime

# set env var for packages cache
ENV DOTNET_HOSTING_OPTIMIZATION_CACHE /packagescache

COPY ./build-cache.sh /packagescache/build-cache.sh

# set up package cache
RUN /packagescache/build-cache.sh http://dist.asp.net/packagecache/1.0.3/debian.8-x64/aspnetcore.cache.legacy.tar.gz \
&& rm /packagescache/build-cache.sh
FROM microsoft/dotnet-nightly:1.0.4-runtime

# set up network
ENV ASPNETCORE_URLS http://+:80

# set env var for packages cache
ENV DOTNET_HOSTING_OPTIMIZATION_CACHE /packagescache
ENV ASPNETCORE_CACHE_VERSION 1.0.4

# set up package cache and other tools
RUN curl -o /tmp/packagescache.tar.gz \
https://dist.asp.net/packagecache/${ASPNETCORE_CACHE_VERSION}/debian.8-x64/aspnetcore.cache.tar.gz \
&& mkdir /packagescache && cd /packagescache \
&& tar xvf /tmp/packagescache.tar.gz \
&& rm /tmp/packagescache.tar.gz
26 changes: 0 additions & 26 deletions 1.0/jessie/runtime/build-cache.sh

This file was deleted.

2 changes: 1 addition & 1 deletion 1.0/jessie/runtime/hooks/post_push
Expand Up @@ -7,7 +7,7 @@ echo "Pushing tag: '$tagName'"
docker tag $IMAGE_NAME $tagName
docker push $tagName

tagName="$DOCKER_REPO:1.0.3"
tagName="$DOCKER_REPO:1.0.4"
echo "Pushing tag: '$tagName'"
docker tag $IMAGE_NAME $tagName
docker push $tagName
19 changes: 10 additions & 9 deletions 1.0/jessie/build-msbuild/Dockerfile → 1.0/jessie/sdk/Dockerfile
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:1.0.3-sdk-msbuild-rc4
FROM microsoft/dotnet-nightly:1.0.4-sdk

# Install keys required for node
RUN set -ex \
Expand Down Expand Up @@ -37,19 +37,20 @@ ENV ASPNETCORE_URLS http://+:80

# set env var for packages cache
ENV DOTNET_HOSTING_OPTIMIZATION_CACHE /packagescache
ENV ASPNETCORE_CACHE_VERSION 1.0.3
ENV ASPNETCORE_CACHE_VERSION 1.0.4

# Build optimized package cache
# copy the ASP.NET packages manifest
COPY packagescache.csproj /tmp/warmup/packagescache.csproj

# set up package cache and other tools
RUN curl -o /tmp/packagescache.tar.gz \
https://dist.asp.net/packagecache/${ASPNETCORE_CACHE_VERSION}/debian.8-x64/aspnetcore.cache.tar.gz \
&& mkdir /packagescache && cd /packagescache \
&& tar xvf /tmp/packagescache.tar.gz \
&& rm /tmp/packagescache.tar.gz

# restore 1.0.3 ASP.NET packages
COPY packagescache.csproj /tmp/warmup/packagescache.csproj

RUN dotnet restore /tmp/warmup/packagescache.csproj \
&& rm /tmp/packagescache.tar.gz \
# restore packages
&& dotnet restore /tmp/warmup/packagescache.csproj \
--source https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json \
--source https://api.nuget.org/v3/index.json \
&& rm -r /tmp/warmup/

Expand Down
Expand Up @@ -7,7 +7,7 @@ echo "Pushing tag: '$tagName'"
docker tag $IMAGE_NAME $tagName
docker push $tagName

tagName="$DOCKER_REPO:1.0.3-msbuild-rc4"
tagName="$DOCKER_REPO:1.0.4"
echo "Pushing tag: '$tagName'"
docker tag $IMAGE_NAME $tagName
docker push $tagName

0 comments on commit 8e43b77

Please sign in to comment.