From c3420cc9c5578b1fe5e14f6117b557e547c75f20 Mon Sep 17 00:00:00 2001 From: jose-fully-ported <141160579+jose-fully-ported@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:03:45 -0400 Subject: [PATCH] Set default builders to be Ubuntu 22.04 based (#3602) --- api/server/handlers/gitinstallation/get_buildpack.go | 2 ++ .../handlers/project_integration/get_gitlab_repo_buildpack.go | 2 ++ dashboard/src/components/repo-selector/BuildpackSelection.tsx | 4 ++-- dashboard/src/main/home/app-dashboard/types/buildpack.ts | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/api/server/handlers/gitinstallation/get_buildpack.go b/api/server/handlers/gitinstallation/get_buildpack.go index 183e90e918..d03f1d4616 100644 --- a/api/server/handlers/gitinstallation/get_buildpack.go +++ b/api/server/handlers/gitinstallation/get_buildpack.go @@ -22,12 +22,14 @@ func initBuilderInfo() map[string]*buildpacks.BuilderInfo { builders[buildpacks.PaketoBuilder] = &buildpacks.BuilderInfo{ Name: "Paketo", Builders: []string{ + "paketobuildpacks/builder-jammy-full:latest", "paketobuildpacks/builder:full", }, } builders[buildpacks.HerokuBuilder] = &buildpacks.BuilderInfo{ Name: "Heroku", Builders: []string{ + "heroku/buildpacks:22", "heroku/buildpacks:20", "heroku/buildpacks:18", }, diff --git a/api/server/handlers/project_integration/get_gitlab_repo_buildpack.go b/api/server/handlers/project_integration/get_gitlab_repo_buildpack.go index 6fdb3a8292..33ef8fb3fa 100644 --- a/api/server/handlers/project_integration/get_gitlab_repo_buildpack.go +++ b/api/server/handlers/project_integration/get_gitlab_repo_buildpack.go @@ -130,12 +130,14 @@ func initBuilderInfo() map[string]*buildpacks.BuilderInfo { builders[buildpacks.PaketoBuilder] = &buildpacks.BuilderInfo{ Name: "Paketo", Builders: []string{ + "paketobuildpacks/builder-jammy-full:latest", "paketobuildpacks/builder:full", }, } builders[buildpacks.HerokuBuilder] = &buildpacks.BuilderInfo{ Name: "Heroku", Builders: []string{ + "heroku/buildpacks:22", "heroku/buildpacks:20", "heroku/buildpacks:18", }, diff --git a/dashboard/src/components/repo-selector/BuildpackSelection.tsx b/dashboard/src/components/repo-selector/BuildpackSelection.tsx index 8431500170..86c75d4010 100644 --- a/dashboard/src/components/repo-selector/BuildpackSelection.tsx +++ b/dashboard/src/components/repo-selector/BuildpackSelection.tsx @@ -10,8 +10,8 @@ import { ActionConfigType } from "shared/types"; import styled, { keyframes } from "styled-components"; const DEFAULT_BUILDER_NAME = "heroku"; -const DEFAULT_PAKETO_STACK = "paketobuildpacks/builder:full"; -const DEFAULT_HEROKU_STACK = "heroku/buildpacks:20"; +const DEFAULT_PAKETO_STACK = "paketobuildpacks/builder-jammy-full:latest"; +const DEFAULT_HEROKU_STACK = "heroku/buildpacks:22"; type BuildConfig = { builder: string; diff --git a/dashboard/src/main/home/app-dashboard/types/buildpack.ts b/dashboard/src/main/home/app-dashboard/types/buildpack.ts index 1ec05dd0b9..0704017db8 100644 --- a/dashboard/src/main/home/app-dashboard/types/buildpack.ts +++ b/dashboard/src/main/home/app-dashboard/types/buildpack.ts @@ -24,8 +24,8 @@ export const detectedBuildpackSchema = z.object({ export type DetectedBuildpack = z.infer; export const DEFAULT_BUILDER_NAME = "heroku"; -export const DEFAULT_PAKETO_STACK = "paketobuildpacks/builder:full"; -export const DEFAULT_HEROKU_STACK = "heroku/buildpacks:20"; +export const DEFAULT_PAKETO_STACK = "paketobuildpacks/builder-jammy-full:latest"; +export const DEFAULT_HEROKU_STACK = "heroku/buildpacks:22"; export const BUILDPACK_TO_NAME: { [key: string]: string } = { "heroku/nodejs": "NodeJS",