Merged PR 916650: Update base images

Update base images
ngi644 · Jun 22, 2018 · 23ed688 · 23ed688
1 parent a45d2fc
commit 23ed688
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/edge-modules/functions/binding/docker/linux/amd64/Dockerfile b/edge-modules/functions/binding/docker/linux/amd64/Dockerfile
@@ -1,5 +1,7 @@
-FROM appsvctest/azure-functions-runtime
+FROM microsoft/azure-functions-dotnet-core2.0:2.0
 
 WORKDIR /app
 
-COPY $EXE_DIR/ ./bindings
+COPY $EXE_DIR/ ./bindings
+
+CMD ["dotnet", "/azure-functions-host/Microsoft.Azure.WebJobs.Script.WebHost.dll"] 
diff --git a/edge-modules/functions/binding/docker/linux/arm32v7/Dockerfile b/edge-modules/functions/binding/docker/linux/arm32v7/Dockerfile
@@ -1,4 +1,4 @@
-FROM microsoft/azure-functions-runtime:2.0.0-stretch-arm32v7
+FROM microsoft/azure-functions-dotnet-core2.0:2.0-arm32v7
 
 WORKDIR /app
 

diff --git a/edge-modules/functions/binding/docker/windows/amd64/Dockerfile b/edge-modules/functions/binding/docker/windows/amd64/Dockerfile
@@ -1,6 +1,6 @@
 # escape=`
 
-FROM microsoft/azure-functions-runtime:2.0.0-nanoserver-1709
+FROM microsoft/azure-functions-dotnet-core2.0:2.0-nanoserver-1803
 
 ARG EXE_DIR=.
 

diff --git a/edge-modules/functions/samples/docker/windows/amd64/Dockerfile b/edge-modules/functions/samples/docker/windows/amd64/Dockerfile
@@ -7,4 +7,4 @@ WORKDIR /app
 
 COPY $EXE_DIR/ ./$FUNCTION_FILE_NAME
 
-CMD dotnet WebJobs.Script.Host\WebJobs.Script.Host.dll $env:FUNCTION_FILE_NAME
+ENV AzureWebJobsScriptRoot=samples
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ WORKDIR /app

		COPY $EXE_DIR/ ./$FUNCTION_FILE_NAME

		CMD dotnet WebJobs.Script.Host\WebJobs.Script.Host.dll $env:FUNCTION_FILE_NAME
		ENV AzureWebJobsScriptRoot=samples