diff --git a/templates/Dockerfile.txt b/templates/Dockerfile.txt index 0e4c303f..27c0f201 100644 --- a/templates/Dockerfile.txt +++ b/templates/Dockerfile.txt @@ -1,11 +1,12 @@ -<% if(!coreclr){ %>FROM microsoft/aspnet:1.0.0-rc1-update1<% } %><% if(coreclr){ %>FROM microsoft/aspnet:1.0.0-rc1-update1-coreclr<% } %> +<% if(!coreclr){ %>FROM microsoft/dotnet<% } %><% if(coreclr){ %>FROM microsoft/dotnet:core<% } %> -RUN printf "deb http://ftp.us.debian.org/debian jessie main\n" >> /etc/apt/sources.list -RUN apt-get -qq update && apt-get install -qqy sqlite3 libsqlite3-dev && rm -rf /var/lib/apt/lists/* +#Set urls and port environments +ENV ASPNETCORE_URLS="http://*:5000" +ENV ASPNETCORE_ENVIRONMENT="Development" COPY . /app WORKDIR /app -RUN ["dnu", "restore"] +RUN ["dotnet", "restore"] -EXPOSE 5000/tcp -ENTRYPOINT ["dnx", "-p", "project.json", "Microsoft.AspNet.Server.Kestrel", "--server.urls", "http://0.0.0.0:5000"] +EXPOSE 5000 +ENTRYPOINT ["dotnet", "run"] diff --git a/test/subgenerators.js b/test/subgenerators.js index 26e91280..ca4e51aa 100644 --- a/test/subgenerators.js +++ b/test/subgenerators.js @@ -103,7 +103,7 @@ describe('Subgenerators without arguments tests', function() { var filename = 'Dockerfile'; util.goCreate(filename); util.fileCheck('should create Dockerfile', filename); - util.fileContentCheck(filename, 'Check the content for Mono-based image tag', /FROM microsoft\/aspnet:1\.0\.0-rc1-update1/); + util.fileContentCheck(filename, 'Check the content for Mono-based image tag', /FROM microsoft\/dotnet/); }); describe('aspnet:Dockerfile CoreCLR-based', function() { @@ -111,7 +111,7 @@ describe('Subgenerators without arguments tests', function() { var filename = 'Dockerfile'; util.goCreateWithArgs(filename, [arg]); util.fileCheck('should create Dockerfile', filename); - util.fileContentCheck(filename, 'Check the content for CoreCLR-based image tag', /FROM microsoft\/aspnet:1\.0\.0-rc1-update1-coreclr/); + util.fileContentCheck(filename, 'Check the content for CoreCLR-based image tag', /FROM microsoft\/dotnet:core/); }); describe('aspnet:nuget', function() {