Skip to content

Commit

Permalink
Merge pull request #1013 from buildpacks/update-lifecycle
Browse files Browse the repository at this point in the history
Update Default Lifecycle Version to 0.10.1
  • Loading branch information
jromero authored Jan 13, 2021
2 parents 55ae0ac + 987daea commit c4f5f3e
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/release-notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ labels:
description: |
_Experimental features that may change in the future. Use them at your discretion._
_To enable these features, add `experimental = true` to your `~/.pack/config.toml`._
_To enable these features, run `pack config experimental true`, or add `experimental = true` to your `~/.pack/config.toml`._
weight: 9
type/enhancement:
title: Features
Expand Down
2 changes: 2 additions & 0 deletions acceptance/acceptance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,7 @@ func testAcceptance(
pack.Supports("build --network"),
"--network flag not supported for build",
)
h.SkipIf(t, dockerHostOS() == "windows", "temporarily disabled on WCOW due to CI flakiness")

var err error
tmpDir, err = ioutil.TempDir("", "archive-buildpacks-")
Expand All @@ -1214,6 +1215,7 @@ func testAcceptance(
})

it.After(func() {
h.SkipIf(t, dockerHostOS() == "windows", "temporarily disabled on WCOW due to CI flakiness")
assert.Succeeds(os.RemoveAll(tmpDir))
assert.Succeeds(h.DockerRmi(dockerCli, repoName))
})
Expand Down
2 changes: 1 addition & 1 deletion acceptance/testdata/pack_fixtures/report_output.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pack:
Version: {{ .Version }}
OS/Arch: {{ .OS }}/{{ .Arch }}

Default Lifecycle Version: 0.9.3
Default Lifecycle Version: 0.10.1

Supported Platform APIs: 0.3, 0.4

Expand Down
2 changes: 1 addition & 1 deletion build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1655,7 +1655,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
h.AssertEq(t, args.Daemon, true)
h.AssertEq(t, args.PullPolicy, config.PullNever)

args = fakeImageFetcher.FetchCalls["buildpacksio/lifecycle:0.9.3"]
args = fakeImageFetcher.FetchCalls["buildpacksio/lifecycle:0.10.1"]
h.AssertEq(t, args.Daemon, true)
h.AssertEq(t, args.PullPolicy, config.PullNever)
})
Expand Down
2 changes: 1 addition & 1 deletion internal/builder/lifecycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

// A snapshot of the latest tested lifecycle version values
const (
DefaultLifecycleVersion = "0.9.3"
DefaultLifecycleVersion = "0.10.1"
DefaultBuildpackAPIVersion = "0.2"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/commands/commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func logError(logger logging.Logger, f func(cmd *cobra.Command, args []string) e
}

func enableExperimentalTip(logger logging.Logger, configPath string) {
logging.Tip(logger, "To enable experimental features, add %s to %s.", style.Symbol("experimental = true"), style.Symbol(configPath))
logging.Tip(logger, "To enable experimental features, run `pack config experimental true` to add %s to %s.", style.Symbol("experimental = true"), style.Symbol(configPath))
}

func multiValueHelp(name string) string {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/config_trusted_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func ConfigTrustedBuilder(logger logging.Logger, cfg config.Config, cfgPath stri
}

listCmd := generateListCmd("trusted-builders", logger, cfg, listTrustedBuilders)
listCmd.Long = "List Trusted Builders.\n\nShow the builders that are either trusted by default or have been explicitly trusted locally using `trust-builder`"
listCmd.Long = "List Trusted Builders.\n\nShow the builders that are either trusted by default or have been explicitly trusted locally using `trusted-builder add`"
listCmd.Example = "pack config trusted-builders list"
cmd.AddCommand(listCmd)

Expand Down
4 changes: 2 additions & 2 deletions internal/commands/create_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ func CreateBuilder(logger logging.Logger, cfg config.Config, client PackClient)
Example: "pack create-builder my-builder:bionic --config ./builder.toml",
Long: `A builder is an image that bundles all the bits and information on how to build your apps, such as buildpacks, an implementation of the lifecycle, and a build-time environment that pack uses when executing the lifecycle. When building an app, you can use community builders; you can see our suggestions by running
pack suggest-builders
pack builder suggest
Creating a custom builder allows you to control what buildpacks are used and what image apps are based on. For more on how to create a builder, see: https://buildpacks.io/docs/operator-guide/create-a-builder/.
`,
RunE: logError(logger, func(cmd *cobra.Command, args []string) error {
logger.Warn("Command 'pack create-builder' has been deprecated, please use 'pack builder create' instead")
deprecationWarning(logger, "create-builder", "builder create")

if err := validateCreateFlags(&flags, cfg); err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/inspect_builder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func testInspectBuilderCommand(t *testing.T, when spec.G, it spec.S) {

assert.Contains(outBuf.String(), `Please select a default builder with:
pack set-default-builder <builder-image>`)
pack config default-builder <builder-image>`)

assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder:base'`))
assert.Matches(outBuf.String(), regexp.MustCompile(`Paketo Buildpacks:\s+'paketobuildpacks/builder:full'`))
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/list_trusted_builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func ListTrustedBuilders(logger logging.Logger, cfg config.Config) *cobra.Comman
cmd := &cobra.Command{
Use: "list-trusted-builders",
Short: "List Trusted Builders",
Long: "List Trusted Builders.\n\nShow the builders that are either trusted by default or have been explicitly trusted locally using `trust-builder`",
Long: "List Trusted Builders.\n\nShow the builders that are either trusted by default or have been explicitly trusted locally using `trusted-builder add`",
Example: "pack list-trusted-builders",
Hidden: true,
RunE: logError(logger, func(cmd *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion internal/commands/package_buildpack.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func PackageBuildpack(logger logging.Logger, cfg config.Config, client Buildpack
Long: "package-buildpack allows users to package (a) buildpack(s) into OCI format, which can then to be hosted in " +
"image repositories. You can also package a number of buildpacks together, to enable easier distribution of " +
"a set of buildpacks. Packaged buildpacks can be used as inputs to `pack build` (using the `--buildpack` flag), " +
"and they can be included in the configs used in `pack create-builder` and `pack package-buildpack`. For more " +
"and they can be included in the configs used in `pack builder create` and `pack buildpack package`. For more " +
"on how to package a buildpack, see: https://buildpacks.io/docs/buildpack-author-guide/package-a-buildpack/.",
RunE: logError(logger, func(cmd *cobra.Command, args []string) error {
deprecationWarning(logger, "package-buildpack", "buildpack package")
Expand Down
1 change: 1 addition & 0 deletions internal/commands/set_run_image_mirrors.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ func SetRunImagesMirrors(logger logging.Logger, cfg config.Config) *cobra.Comman
Short: "Set mirrors to other repositories for a given run image",
Example: "pack set-run-image-mirrors cnbs/sample-stack-run:bionic --mirror index.docker.io/cnbs/sample-stack-run:bionic",
RunE: logError(logger, func(cmd *cobra.Command, args []string) error {
deprecationWarning(logger, "set-run-image-mirrors", "config run-image-mirrors")
runImage := args[0]
cfg = config.SetRunImageMirrors(cfg, runImage, mirrors)
configPath, err := config.DefaultConfigPath()
Expand Down
4 changes: 2 additions & 2 deletions internal/commands/suggest_builders.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func SuggestBuilders(logger logging.Logger, inspector BuilderInspector) *cobra.C
Short: "Display list of recommended builders",
Example: "pack suggest-builders",
Run: func(cmd *cobra.Command, s []string) {
logger.Warn("Command 'pack suggest-builder' has been deprecated, please use 'pack builder suggest' instead")
deprecationWarning(logger, "suggest-builder", "builder suggest")
suggestBuilders(logger, inspector)
},
}
Expand All @@ -66,7 +66,7 @@ func SuggestBuilders(logger logging.Logger, inspector BuilderInspector) *cobra.C
func suggestSettingBuilder(logger logging.Logger, inspector BuilderInspector) {
logger.Info("Please select a default builder with:")
logger.Info("")
logger.Info("\tpack set-default-builder <builder-image>")
logger.Info("\tpack config default-builder <builder-image>")
logger.Info("")
suggestBuilders(logger, inspector)
}
Expand Down

0 comments on commit c4f5f3e

Please sign in to comment.