Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update default lifecycle to 0.8.0 #724

Merged
merged 2 commits into from
Jul 6, 2020
Merged

Update default lifecycle to 0.8.0 #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1cd759
Update default lifecycle to 0.8.0
jromero Jul 1, 2020
b9d1bf2
Merge branch 'release/0.12.0' into feature/714-update-default-lifecycle
jromero Jul 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acceptance/testdata/pack_fixtures/report_output.txt
View file
Open in desktop
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.7.5
Default Lifecycle Version: 0.8.0

Config:
default-builder-image = "{{ .DefaultBuilder }}"
12 changes: 9 additions & 3 deletions build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,12 @@ import (
"github.com/buildpacks/pack/internal/style"
)

const lifecycleImageRepo = "buildpacksio/lifecycle"
const (
lifecycleImageRepo = "buildpacksio/lifecycle"
minLifecycleVersionSupportingCreator = "0.7.4"
prevLifecycleVersionSupportingImage = "0.6.1"
minLifecycleVersionSupportingImage = "0.7.5"
)

type Lifecycle interface {
Execute(ctx context.Context, opts build.LifecycleOptions) error
Expand Down Expand Up @@ -164,15 +169,16 @@ func (c *Client) Build(ctx context.Context, opts BuildOptions) error {
lifecycleVersion := ephemeralBuilder.LifecycleDescriptor().Info.Version
// Technically the creator is supported as of platform API version 0.3 (lifecycle version 0.7.0+) but earlier versions
// have bugs that make using the creator problematic.
lifecycleSupportsCreator := !lifecycleVersion.LessThan(semver.MustParse("0.7.4"))
lifecycleSupportsCreator := !lifecycleVersion.LessThan(semver.MustParse(minLifecycleVersionSupportingCreator))

if lifecycleSupportsCreator && opts.TrustBuilder {
lifecycleOpts.UseCreator = true
// no need to fetch a lifecycle image, it won't be used
return c.lifecycle.Execute(ctx, lifecycleOpts)
}

lifecycleImageSupported := lifecycleVersion.Equal(builder.VersionMustParse("0.6.1")) || !lifecycleVersion.LessThan(semver.MustParse("0.7.5"))
lifecycleImageSupported := lifecycleVersion.Equal(builder.VersionMustParse(prevLifecycleVersionSupportingImage)) || !lifecycleVersion.LessThan(semver.MustParse(minLifecycleVersionSupportingImage))

if !opts.TrustBuilder {
switch lifecycleImageSupported {
case true:
Expand Down
17 changes: 7 additions & 10 deletions build_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ import (
h "github.com/buildpacks/pack/testhelpers"
)

// 0.7.5 is the first lifecycle version where both creator and the "lifecycle image" are supported.
const defaultBuilderLifecycleVersion = "0.7.5"

func TestBuild(t *testing.T) {
color.Disable(true)
defer color.Disable(false)
Expand Down Expand Up @@ -78,7 +75,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
defaultBuilderName = "example.com/default/builder:tag"
defaultBuilderStackID = "some.stack.id"

defaultBuilderImage = newFakeBuilderImage(t, tmpDir, defaultBuilderName, defaultBuilderStackID, defaultBuilderLifecycleVersion)
defaultBuilderImage = newFakeBuilderImage(t, tmpDir, defaultBuilderName, defaultBuilderStackID, builder.DefaultLifecycleVersion)
h.AssertNil(t, defaultBuilderImage.SetLabel("io.buildpacks.stack.mixins", `["mixinA", "build:mixinB", "mixinX", "build:mixinY"]`))
fakeImageFetcher.LocalImages[defaultBuilderImage.Name()] = defaultBuilderImage

Expand All @@ -97,7 +94,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
h.AssertNil(t, fakeMirror2.SetLabel("io.buildpacks.stack.mixins", `["mixinA", "mixinX", "run:mixinZ"]`))
fakeImageFetcher.LocalImages[fakeMirror2.Name()] = fakeMirror2

fakeLifecycleImage = fakes.NewImage(fmt.Sprintf("%s:%s", lifecycleImageRepo, defaultBuilderLifecycleVersion), "", nil)
fakeLifecycleImage = fakes.NewImage(fmt.Sprintf("%s:%s", lifecycleImageRepo, builder.DefaultLifecycleVersion), "", nil)
fakeImageFetcher.LocalImages[fakeLifecycleImage.Name()] = fakeLifecycleImage

docker, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion("1.38"))
Expand Down Expand Up @@ -331,7 +328,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
Lifecycle: builder.LifecycleMetadata{
LifecycleInfo: builder.LifecycleInfo{
Version: &builder.Version{
Version: *semver.MustParse("0.7.5"),
Version: *semver.MustParse(builder.DefaultLifecycleVersion),
},
},
API: builder.LifecycleAPI{
Expand Down Expand Up @@ -1499,7 +1496,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
h.AssertEq(t, args.Daemon, true)
h.AssertEq(t, args.Pull, false)

args = fakeImageFetcher.FetchCalls["buildpacksio/lifecycle:0.7.5"]
args = fakeImageFetcher.FetchCalls["buildpacksio/lifecycle:0.8.0"]
h.AssertEq(t, args.Daemon, true)
h.AssertEq(t, args.Pull, false)
})
Expand Down Expand Up @@ -1627,7 +1624,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
Lifecycle: builder.LifecycleMetadata{
LifecycleInfo: builder.LifecycleInfo{
Version: &builder.Version{
Version: *semver.MustParse("0.7.5"),
Version: *semver.MustParse(builder.DefaultLifecycleVersion),
},
},
API: builder.LifecycleAPI{
Expand Down Expand Up @@ -1676,7 +1673,7 @@ func testBuild(t *testing.T, when spec.G, it spec.S) {
Lifecycle: builder.LifecycleMetadata{
LifecycleInfo: builder.LifecycleInfo{
Version: &builder.Version{
Version: *semver.MustParse("0.7.5"),
Version: *semver.MustParse(builder.DefaultLifecycleVersion),
},
},
API: builder.LifecycleAPI{
Expand Down Expand Up @@ -1897,7 +1894,7 @@ type executeFailsLifecycle struct {
Opts build.LifecycleOptions
}

func (f *executeFailsLifecycle) Execute(ctx context.Context, opts build.LifecycleOptions) error {
func (f *executeFailsLifecycle) Execute(_ context.Context, opts build.LifecycleOptions) error {
f.Opts = opts
return errors.New("")
}
2 changes: 1 addition & 1 deletion internal/builder/lifecycle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
)

const (
DefaultLifecycleVersion = "0.7.5"
DefaultLifecycleVersion = "0.8.0"
DefaultBuildpackAPIVersion = "0.2"
)

Expand Down