Clean up Node.js docker files

Author: ejizba

src/Azure.Functions.Cli/Actions/LocalActions/InitAction.cs

@@ -438,11 +438,11 @@ private static async Task WriteDockerfile(WorkerRuntime workerRuntime, string la
             {
                 if (language == Constants.Languages.TypeScript)
                 {
-                    await FileSystemHelpers.WriteFileIfNotExists("Dockerfile", await StaticResources.DockerfileTypescriptNode18);
+                    await FileSystemHelpers.WriteFileIfNotExists("Dockerfile", await StaticResources.DockerfileTypeScript);
                 }
                 else
                 {
-                    await FileSystemHelpers.WriteFileIfNotExists("Dockerfile", await StaticResources.DockerfileNode18);
+                    await FileSystemHelpers.WriteFileIfNotExists("Dockerfile", await StaticResources.DockerfileJavaScript);
                 }
             }
             else if (workerRuntime == Helpers.WorkerRuntime.python)

src/Azure.Functions.Cli/Azure.Functions.Cli.csproj

@@ -92,12 +92,6 @@
     <EmbeddedResource Include="StaticResources\Dockerfile.java11">
       <LogicalName>$(AssemblyName).Dockerfile.java11</LogicalName>
     </EmbeddedResource>
-    <EmbeddedResource Include="StaticResources\Dockerfile.node14">
-      <LogicalName>$(AssemblyName).Dockerfile.node14</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="StaticResources\Dockerfile.node16">
-      <LogicalName>$(AssemblyName).Dockerfile.node16</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="StaticResources\Dockerfile.powershell7">
       <LogicalName>$(AssemblyName).Dockerfile.powershell7</LogicalName>
     </EmbeddedResource>
@@ -119,15 +113,12 @@
     <EmbeddedResource Include="StaticResources\Dockerfile.python3.11">
       <LogicalName>$(AssemblyName).Dockerfile.python3.11</LogicalName>
     </EmbeddedResource>
+    <EmbeddedResource Include="StaticResources\Dockerfile.javascript">
+      <LogicalName>$(AssemblyName).Dockerfile.javascript</LogicalName>
+    </EmbeddedResource>
     <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>

src/Azure.Functions.Cli/StaticResources/Dockerfile.node14 renamed to src/Azure.Functions.Cli/StaticResources/Dockerfile.javascript

@@ -1,6 +1,6 @@
 # To enable ssh & remote debugging on app service change the base image to the one below
-# FROM mcr.microsoft.com/azure-functions/node:4-node14-appservice
-FROM mcr.microsoft.com/azure-functions/node:4-node14
+# FROM mcr.microsoft.com/azure-functions/node:4-node20-appservice
+FROM mcr.microsoft.com/azure-functions/node:4-node20
 
 ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
     AzureFunctionsJobHost__Logging__Console__IsEnabled=true

src/Azure.Functions.Cli/StaticResources/Dockerfile.node16

@@ -1,6 +1,6 @@
 # To enable ssh & remote debugging on app service change the base image to the one below
-# FROM mcr.microsoft.com/azure-functions/node:4-node16-appservice
-FROM mcr.microsoft.com/azure-functions/node:4-node16
+# FROM mcr.microsoft.com/azure-functions/node:4-node20-appservice
+FROM mcr.microsoft.com/azure-functions/node:4-node20
 
 ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
     AzureFunctionsJobHost__Logging__Console__IsEnabled=true

src/Azure.Functions.Cli/StaticResources/Dockerfile.node18

@@ -59,15 +59,9 @@ public static async Task<string> GetValue(string name)
 
         public static Task<string> DockerfilePowershell72 => GetValue("Dockerfile.powershell7.2");
 
-        public static Task<string> DockerfileNode14 => GetValue("Dockerfile.node14");
+        public static Task<string> DockerfileJavaScript => GetValue("Dockerfile.javascript");
 
-        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> DockerfileTypeScript => GetValue("Dockerfile.typescript");
 
         public static Task<string> DockerIgnoreFile => GetValue("dockerignore");