Просмотр исходного кода

Merge branch 'stacks-v1' of github.com:porter-dev/porter into stacks-v1

Justin Rhee 3 лет назад
Родитель
Сommit
52e4b271c6

+ 2 - 2
dashboard/src/components/repo-selector/BuildpackStack.tsx

@@ -47,7 +47,7 @@ export const BuildpackStack: React.FC<{
   branch: string;
   hide: boolean;
   onChange: (config: BuildConfig) => void;
-}> = ({ actionConfig, folderPath, branch, hide, builder, onChange }) => {
+}> = ({ actionConfig, folderPath, branch, hide, onChange }) => {
   const { currentProject } = useContext(Context);
 
   const [builders, setBuilders] = useState<DetectedBuildpack[]>(null);
@@ -115,7 +115,7 @@ export const BuildpackStack: React.FC<{
     if (typeof onChange === "function") {
       onChange(buildConfig);
     }
-  }, [builder, selectedStack, selectedBuildpacks]);
+  }, [selectedStack, selectedBuildpacks]);
 
   const detectBuildpack = () => {
     if (actionConfig.kind === "gitlab") {

+ 2 - 2
dashboard/src/main/home/app-dashboard/new-app-flow/NewAppFlow.tsx

@@ -167,8 +167,8 @@ const NewAppFlow: React.FC<Props> = ({ ...props }) => {
           repo_name: actionConfig.git_repo,
           git_branch: branch,
           build_context: folderPath,
-          builder: "heroku",
-          buildpacks: "nodejs,ruby",
+          builder: buildConfig?.builder,
+          buildpacks: buildConfig?.buildPacks,
           dockerfile: dockerfilePath,
         },
         {