fix: Fix the wrong value of the target template when s2i is rebuilded

kubesphere · Jun 19, 2020 · fab8319 · fab8319
1 parent 6702e73
commit fab8319
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/components/Forms/ImageBuilder/S2IForm/TemplateSelect/index.jsx b/src/components/Forms/ImageBuilder/S2IForm/TemplateSelect/index.jsx
@@ -50,6 +50,10 @@ export default class TemplateSelect extends React.PureComponent {
     return get(this.props.formTemplate, 'metadata.annotations.languageType')
   }
 
+  get builderImage() {
+    return get(this.props.formTemplate, 'spec.config.builderImage')
+  }
+
   get containerList() {
     const { builderTemplate } = this.props
 
@@ -100,7 +104,9 @@ export default class TemplateSelect extends React.PureComponent {
 
     return get(
       builderTemplate.find(
-        template => get(template, 'spec.codeFramework') === this.languageType
+        template =>
+          get(template, 'spec.codeFramework') === this.languageType &&
+          get(template, 'spec.config.builderImage') === this.builderImage
       ),
       'spec.defaultBaseImage',
       ''