Merge pull request #4 from LinuxSuRen/maven-args

Add two more maven related envs
kubesphere-sigs · Sep 14, 2021 · 33503a3 · 33503a3
2 parents a8ce171 + 7845ec8
commit 33503a3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/charts/ks-devops/charts/s2i/templates/java.yaml b/charts/ks-devops/charts/s2i/templates/java.yaml
@@ -35,6 +35,16 @@ spec:
       description: "Additional Maven arguments, useful for temporary adding arguments like -X or -am -pl ."
       required: false
       defaultValue: ""
+    - key: MAVEN_MIRROR_URL
+      type: string
+      description: "With Repositories you specify from which locations you want to download certain artifacts, such as dependencies and maven-plugins."
+      required: false
+      defaultValue: ""
+    - key: MAVEN_CLEAR_REPO
+      type: boolean
+      description: "If set then the Maven repository is removed after the artifact is built. This is useful for keeping the created application image small, but prevents incremental builds. The default is false"
+      required: false
+      defaultValue: ""
     - key: ARTIFACT_DIR
       type: string
       description: "Path to target/ where the jar files are created for multi module builds. These are added to ${MAVEN_ARGS}"
@@ -45,11 +55,6 @@ spec:
       description: "Arguments to use when copying artifacts from the output dir to the application dir. Useful to specify which artifacts will be part of the image. It defaults to -r hawt-app/* when a hawt-app dir is found on the build directory, otherwise jar files only will be included (*.jar)."
       required: false
       defaultValue: ""
-    - key: MAVEN_CLEAR_REPO
-      type: boolean
-      description: "If set then the Maven repository is removed after the artifact is built. This is useful for keeping the created application image small, but prevents incremental builds. The default is false"
-      required: false
-      defaultValue: ""
     - key: JAVA_APP_DIR
       type: string
       description: "the directory where the application resides. All paths in your application are relative to this directory. By default it is the same directory where this startup script resides."
@@ -142,6 +147,6 @@ spec:
       defaultValue: ""
   codeFramework: java
   defaultBaseImage: {{ .Values.image.registry }}/{{ .Values.java8CentOs7.image.name }}:{{ .Values.java8CentOs7.image.tag }}
-  version: 0.0.1
+  version: 0.0.2
   description: "This is a builder template for Java builds whose result can be run directly without any further application server.It's suited ideally for microservices with a flat classpath (including \"far jars\")"
   iconPath: assets/java.png
diff --git a/charts/ks-devops/charts/s2i/templates/tomcat.yaml b/charts/ks-devops/charts/s2i/templates/tomcat.yaml
@@ -36,6 +36,16 @@ spec:
       description: "Additional Maven arguments, useful for temporary adding arguments like -X or -am -pl ."
       required: false
       defaultValue: ""
+    - key: MAVEN_MIRROR_URL
+      type: string
+      description: "With Repositories you specify from which locations you want to download certain artifacts, such as dependencies and maven-plugins."
+      required: false
+      defaultValue: ""
+    - key: MAVEN_CLEAR_REPO
+      type: boolean
+      description: "If set then the Maven repository is removed after the artifact is built. This is useful for keeping the created application image small, but prevents incremental builds. The default is false"
+      required: false
+      defaultValue: ""
     - key: ARTIFACT_DIR
       type: string
       description: "Path to target/ where the jar files are created for multi module builds. These are added to ${MAVEN_ARGS}"
@@ -46,11 +56,6 @@ spec:
       description: "Arguments to use when copying artifacts from the output dir to the application dir. Useful to specify which artifacts will be part of the image. It defaults to -r hawt-app/* when a hawt-app dir is found on the build directory, otherwise jar files only will be included (*.jar)."
       required: false
       defaultValue: ""
-    - key: MAVEN_CLEAR_REPO
-      type: boolean
-      description: "If set then the Maven repository is removed after the artifact is built. This is useful for keeping the created application image small, but prevents incremental builds. The default is false"
-      required: false
-      defaultValue: ""
     - key: JAVA_APP_DIR
       type: string
       description: "the directory where the application resides. All paths in your application are relative to this directory. By default it is the same directory where this startup script resides."
@@ -143,6 +148,6 @@ spec:
       defaultValue: ""
   codeFramework: java
   defaultBaseImage: {{ .Values.image.registry }}/{{ .Values.tomcat85Java8.image.name }}:{{ .Values.tomcat85Java8.image.tag }}
-  version: 0.0.1
+  version: 0.0.2
   description: "This is a builder template for Java builds whose result can be run directly with Tomcat application server."
   iconPath: assets/tomcat.png