Updating the docker files. (#3359)

Azure · May 10, 2023 · 623c085 · 623c085
1 parent f032367
commit 623c085
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 8 deletions.
diff --git a/src/Azure.Functions.Cli/Actions/LocalActions/InitAction.cs b/src/Azure.Functions.Cli/Actions/LocalActions/InitAction.cs
@@ -398,11 +398,11 @@ private static async Task WriteDockerfile(WorkerRuntime workerRuntime, string la
             {
                 if (language == Constants.Languages.TypeScript)
                 {
-                    await FileSystemHelpers.WriteFileIfNotExists("Dockerfile", await StaticResources.DockerfileTypescript);
+                    await FileSystemHelpers.WriteFileIfNotExists("Dockerfile", await StaticResources.DockerfileTypescriptNode18);
                 }
                 else
                 {
-                    await FileSystemHelpers.WriteFileIfNotExists("Dockerfile", await StaticResources.DockerfileNode16);
+                    await FileSystemHelpers.WriteFileIfNotExists("Dockerfile", await StaticResources.DockerfileNode18);
                 }
             }
             else if (workerRuntime == Helpers.WorkerRuntime.python)

diff --git a/src/Azure.Functions.Cli/Azure.Functions.Cli.csproj b/src/Azure.Functions.Cli/Azure.Functions.Cli.csproj
@@ -100,6 +100,12 @@
     <EmbeddedResource Include="StaticResources\Dockerfile.typescript">
       <LogicalName>$(AssemblyName).Dockerfile.typescript</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="StaticResources\Dockerfile.node18">
+    <LogicalName>$(AssemblyName).Dockerfile.node18</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="StaticResources\Dockerfile.typescript.node18">
+    <LogicalName>$(AssemblyName).Dockerfile.typescript.node18</LogicalName>
+    </EmbeddedResource>
     <EmbeddedResource Include="StaticResources\gitignore">
       <LogicalName>$(AssemblyName).gitignore</LogicalName>
     </EmbeddedResource>

diff --git a/src/Azure.Functions.Cli/StaticResources/Dockerfile.dotnet b/src/Azure.Functions.Cli/StaticResources/Dockerfile.dotnet
@@ -1,8 +1,5 @@
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS installer-env
 
-# Build requires 3.1 SDK
-COPY --from=mcr.microsoft.com/dotnet/core/sdk:3.1 /usr/share/dotnet /usr/share/dotnet
-
 COPY . /src/dotnet-function-app
 RUN cd /src/dotnet-function-app && \
     mkdir -p /home/site/wwwroot && \

diff --git a/src/Azure.Functions.Cli/StaticResources/Dockerfile.dotnetIsolated b/src/Azure.Functions.Cli/StaticResources/Dockerfile.dotnetIsolated
@@ -1,8 +1,5 @@
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS installer-env
 
-# Build requires 3.1 SDK
-COPY --from=mcr.microsoft.com/dotnet/core/sdk:3.1 /usr/share/dotnet /usr/share/dotnet
-
 COPY . /src/dotnet-function-app
 RUN cd /src/dotnet-function-app && \
 mkdir -p /home/site/wwwroot && \

diff --git a/src/Azure.Functions.Cli/StaticResources/Dockerfile.node18 b/src/Azure.Functions.Cli/StaticResources/Dockerfile.node18
@@ -0,0 +1,11 @@
+# To enable ssh & remote debugging on app service change the base image to the one below
+# FROM mcr.microsoft.com/azure-functions/node:4-node18-appservice
+FROM mcr.microsoft.com/azure-functions/node:4-node18
+
+ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
+    AzureFunctionsJobHost__Logging__Console__IsEnabled=true
+
+COPY . /home/site/wwwroot
+
+RUN cd /home/site/wwwroot && \
+    npm install
diff --git a/src/Azure.Functions.Cli/StaticResources/Dockerfile.typescript.node18 b/src/Azure.Functions.Cli/StaticResources/Dockerfile.typescript.node18
@@ -0,0 +1,12 @@
+# To enable ssh & remote debugging on app service change the base image to the one below
+# FROM mcr.microsoft.com/azure-functions/node:4-node18-appservice
+FROM mcr.microsoft.com/azure-functions/node:4-node18
+
+ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
+    AzureFunctionsJobHost__Logging__Console__IsEnabled=true
+
+COPY . /home/site/wwwroot
+
+RUN cd /home/site/wwwroot && \
+    npm install && \
+    npm run build
diff --git a/src/Azure.Functions.Cli/StaticResources/StaticResources.cs b/src/Azure.Functions.Cli/StaticResources/StaticResources.cs
@@ -58,8 +58,12 @@ public static async Task<string> GetValue(string name)
 
         public static Task<string> DockerfileNode16 => GetValue("Dockerfile.node16");
 
+        public static Task<string> DockerfileNode18 => GetValue("Dockerfile.node18");
+
         public static Task<string> DockerfileTypescript => GetValue("Dockerfile.typescript");
 
+        public static Task<string> DockerfileTypescriptNode18 => GetValue("Dockerfile.typescript.node18");
+
         public static Task<string> DockerIgnoreFile => GetValue("dockerignore");
 
         public static Task<string> VsCodeExtensionsJson => GetValue("vscode.extensions.json");