Update docker file and pricingTier for docker support (#137)

microsoft · Mar 4, 2020 · 41dbd36 · 41dbd36
1 parent 90385a2
commit 41dbd36
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/azure-functions-archetype/pom.xml b/azure-functions-archetype/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-functions-archetype</artifactId>
-    <version>1.26-SNAPSHOT</version>
+    <version>1.26</version>
     <packaging>jar</packaging>
 
     <name>Maven Archetype for Azure Functions</name>

diff --git a/azure-functions-archetype/src/main/resources/archetype-resources/Dockerfile b/azure-functions-archetype/src/main/resources/archetype-resources/Dockerfile
@@ -8,9 +8,15 @@ RUN cd /src/java-function-app && \
     cd $(ls -d */|head -n 1) && \
     cp -a . /home/site/wwwroot
 
-# To enable ssh & remote debugging on app service change the base image to the one below
-# FROM mcr.microsoft.com/azure-functions/java:3.0-java8-appservice
-FROM mcr.microsoft.com/azure-functions/java:3.0-java8
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+# This image is ssh enabled
+FROM mcr.microsoft.com/azure-functions/java:3.0-java8-appservice
+
+# If you want to deploy outside of Azure, use this image
+#FROM mcr.microsoft.com/azure-functions/java:3.0-java8
 
 ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
     AzureFunctionsJobHost__Logging__Console__IsEnabled=true

diff --git a/azure-functions-archetype/src/main/resources/archetype-resources/pom-docker.xml b/azure-functions-archetype/src/main/resources/archetype-resources/pom-docker.xml
@@ -13,7 +13,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <azure.functions.maven.plugin.version>1.4.0</azure.functions.maven.plugin.version>
+        <azure.functions.maven.plugin.version>1.4.1</azure.functions.maven.plugin.version>
         <azure.functions.java.library.version>1.3.1</azure.functions.java.library.version>
         <functionAppName>${artifactId.toLowerCase()}-${package.getClass().forName("java.time.LocalDateTime").getMethod("now").invoke(null).format($package.Class.forName("java.time.format.DateTimeFormatter").getMethod("ofPattern", $package.Class).invoke(null, "yyyyMMddHHmmssSSS"))}</functionAppName>
         <stagingDirectory>${project.build.directory}/azure-functions/${functionAppName}</stagingDirectory>
@@ -128,7 +128,7 @@
                     <region>westus</region>
                     <!-- function pricingTier, default to be consumption if not specified -->
                     <!-- refers https://github.com/microsoft/azure-maven-plugins/tree/develop/azure-functions-maven-plugin#supported-pricing-tiers for all valid values -->
-                    <pricingTier>P1V2</pricingTier>
+                    <pricingTier>EP1</pricingTier>
                     <runtime>
                         <!-- runtime os, could be windows, linux or docker-->
                         <os>docker</os>