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

Commit 43895bc

Browse files
author
Nate McMaster
committed
Add the kitchensink nano image and install git to nanoserver images
1 parent a5dcafc commit 43895bc

File tree

12 files changed

+354
-46
lines changed

12 files changed

+354
-46
lines changed

‎1.0/jessie/sdk/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
FROM microsoft/dotnet:1.0.4-sdk
22

3+
# set up environment
4+
ENV ASPNETCORE_URLS http://+:80
5+
ENV NODE_VERSION 6.10.2
6+
37
# Install keys required for node
48
RUN set -ex \
59
&& for key in \
@@ -15,8 +19,6 @@ RUN set -ex \
1519
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
1620
done
1721

18-
ENV NODE_VERSION 6.10.2
19-
2022
# set up node
2123
RUN buildDeps='xz-utils' \
2224
&& set -x \
@@ -33,9 +35,6 @@ RUN buildDeps='xz-utils' \
3335
&& npm install -g bower gulp \
3436
&& echo '{ "allow_root": true }' > /root/.bowerrc
3537

36-
# set up network
37-
ENV ASPNETCORE_URLS http://+:80
38-
3938
# warmup up NuGet package cache
4039
COPY packagescache.csproj /tmp/warmup/packagescache.csproj
4140
RUN dotnet restore /tmp/warmup/packagescache.csproj \

‎1.0/nanoserver/sdk/Dockerfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
# escape=`
22
FROM microsoft/dotnet:1.0.4-sdk-nanoserver-10.0.14393.953
33

4-
# Install node
4+
# set up environment
5+
ENV ASPNETCORE_URLS http://+:80
56
ENV NODE_VERSION 6.10.2
67

8+
# Install node
79
RUN Invoke-WebRequest -UseBasicParsing https://nodejs.org/dist/v${env:NODE_VERSION}/node-v${env:NODE_VERSION}-win-x64.zip -outfile node.zip; `
810
Expand-Archive node.zip -DestinationPath ${env:TEMP}/nodejs-tmp; `
911
Move-Item ${env:TEMP}/nodejs-tmp/node-v${env:NODE_VERSION}-win-x64 ${env:ProgramFiles}/nodejs; `
1012
Remove-Item -Force node.zip; `
1113
$env:PATH += \";${env:ProgramFiles}/nodejs\"; `
12-
& npm install -g gulp bower
14+
& npm install -g gulp bower; `
15+
Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.12.2.windows.2/MinGit-2.12.2.2-64-bit.zip -outfile git.zip; `
16+
Expand-Archive git.zip -DestinationPath $Env:ProgramFiles/git; `
17+
Remove-Item -Force git.zip
1318

14-
RUN setx /M PATH $($Env:PATH + ';' + $Env:ProgramFiles + '\nodejs')
15-
16-
# set up network
17-
ENV ASPNETCORE_URLS http://+:80
19+
RUN setx /M PATH $($Env:PATH + ';' + $Env:ProgramFiles + '/nodejs' + ';' + $Env:ProgramFiles + '/git/cmd')
1820

1921
# warmup up NuGet package cache
2022
COPY packagescache.csproj C:/warmup/packagescache.csproj
21-
2223
RUN dotnet restore C:/warmup/packagescache.csproj `
2324
--source https://api.nuget.org/v3/index.json; `
2425
Remove-Item -Recurse -Force C:/warmup

kitchensink/Dockerfile renamed to 1.1/jessie/kitchensink/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
FROM microsoft/dotnet:1.1.1-sdk
22

3+
# set up environment
4+
ENV ASPNETCORE_URLS http://+:80
5+
ENV NODE_VERSION 6.10.2
6+
37
RUN set -ex \
48
&& for key in \
59
9554F04D7259F04124DE6B476D5A82AC7E37093B \
@@ -14,8 +18,6 @@ RUN set -ex \
1418
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
1519
done
1620

17-
ENV NODE_VERSION 6.10.2
18-
1921
# set up node
2022
RUN buildDeps='xz-utils' \
2123
&& set -x \
@@ -40,10 +42,10 @@ RUN curl -H 'Cache-Control: no-cache' -o /tmp/Microsoft.Docker.Sdk.tar.gz https:
4042
&& rm /tmp/Microsoft.Docker.Sdk.tar.gz
4143

4244
# copy the ASP.NET packages manifest
43-
COPY packagecache.csproj /tmp/warmup/packagecache.csproj
45+
COPY packagescache.csproj /tmp/warmup/packagescache.csproj
4446

4547
# warm up package cache
46-
RUN dotnet restore /tmp/warmup/packagecache.csproj \
48+
RUN dotnet restore /tmp/warmup/packagescache.csproj \
4749
--source https://api.nuget.org/v3/index.json \
4850
&& rm -rf /tmp/warmup/
4951

kitchensink/hooks/post_push renamed to 1.1/jessie/kitchensink/hooks/post_push

File renamed without changes.

kitchensink/packagecache.csproj renamed to 1.1/jessie/kitchensink/packagescache.csproj

File renamed without changes.

‎1.1/jessie/sdk/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
FROM microsoft/dotnet:1.1.1-sdk
22

3+
# set up environment
4+
ENV ASPNETCORE_URLS http://+:80
5+
ENV NODE_VERSION 6.10.2
6+
37
# Install keys required for node
48
RUN set -ex \
59
&& for key in \
@@ -15,8 +19,6 @@ RUN set -ex \
1519
gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
1620
done
1721

18-
ENV NODE_VERSION 6.10.2
19-
2022
# set up node
2123
RUN buildDeps='xz-utils' \
2224
&& set -x \
@@ -34,9 +36,6 @@ RUN buildDeps='xz-utils' \
3436
&& npm install -g bower gulp \
3537
&& echo '{ "allow_root": true }' > /root/.bowerrc
3638

37-
# set up network
38-
ENV ASPNETCORE_URLS http://+:80
39-
4039
# warmup NuGet package cache
4140
COPY packagescache.csproj /tmp/warmup/packagescache.csproj
4241
RUN dotnet restore /tmp/warmup/packagescache.csproj \

‎1.1/jessie/sdk/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This repository contains images that are used to compile/publish ASP.NET Core ap
1111

1212
- [`1.1.1`, `1.1`, `latest` (*Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/sdk/Dockerfile)
1313
- [`1.0.4`, `1.0`, `lts` (*Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.0/jessie/sdk/Dockerfile)
14-
- [`1.0-1.1-2017-03`, `1.0-1.1` (designed for CI builds), (*Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/kitchensink/Dockerfile)
14+
- [`1.0-1.1-2017-03`, `1.0-1.1` (designed for CI builds), (*Dockerfile*)](https://github.com/aspnet/aspnet-docker/blob/master/1.1/jessie/kitchensink/Dockerfile)
1515

1616
## What is ASP.NET Core?
1717

‎1.1/nanoserver/kitchensink/Dockerfile‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# escape=`
2+
FROM microsoft/dotnet:1.1.1-sdk-nanoserver-10.0.14393.953
3+
4+
# set up environment
5+
ENV ASPNETCORE_URLS http://+:80
6+
ENV NODE_VERSION 6.10.2
7+
8+
# Install node, bower, and git
9+
RUN Invoke-WebRequest -UseBasicParsing https://nodejs.org/dist/v${env:NODE_VERSION}/node-v${env:NODE_VERSION}-win-x64.zip -outfile node.zip; `
10+
Expand-Archive node.zip -DestinationPath ${env:TEMP}/nodejs-tmp; `
11+
Move-Item ${env:TEMP}/nodejs-tmp/node-v${env:NODE_VERSION}-win-x64 ${env:ProgramFiles}/nodejs; `
12+
Remove-Item -Force node.zip; `
13+
$env:PATH += \";${env:ProgramFiles}/nodejs\"; `
14+
& npm install -g gulp bower; `
15+
Invoke-WebRequest -UseBasicParsing https://github.com/git-for-windows/git/releases/download/v2.12.2.windows.2/MinGit-2.12.2.2-64-bit.zip -outfile git.zip; `
16+
Expand-Archive git.zip -DestinationPath $Env:ProgramFiles/git; `
17+
Remove-Item -Force git.zip
18+
19+
RUN setx /M PATH $($Env:PATH + ';' + $Env:ProgramFiles + '/nodejs' + ';' + $Env:ProgramFiles + '/git/cmd')
20+
21+
# Add Docker SDK for when building a solution that has the Docker tools project.
22+
RUN Invoke-WebRequest -UseBasicParsing https://distaspnet.blob.core.windows.net/sdk/Microsoft.Docker.Sdk.zip -OutFile sdk.zip; `
23+
Expand-Archive sdk.zip -DestinationPath \"${Env:ProgramFiles}/dotnet/sdk/${env:DOTNET_SDK_VERSION}/Sdks\"; `
24+
Remove-Item -Force sdk.zip
25+
26+
# warmup up NuGet package cache
27+
COPY packagescache.csproj C:/warmup/packagescache.csproj
28+
RUN dotnet restore C:/warmup/packagescache.csproj `
29+
--source https://api.nuget.org/v3/index.json; `
30+
Remove-Item -Recurse -Force C:/warmup

0 commit comments

Comments
 (0)