Skip to content

Implement RFC-0096 Remove Stacks & Mixins: phase 1#1660

Merged
dfreilich merged 5 commits intomainfrom
jkutner/rfc-0096
Mar 28, 2023
Merged

Implement RFC-0096 Remove Stacks & Mixins: phase 1#1660
dfreilich merged 5 commits intomainfrom
jkutner/rfc-0096

Conversation

@jkutner
Copy link
Copy Markdown
Member

@jkutner jkutner commented Mar 4, 2023

Summary

Phase of RFC #0096 - Remove Stacks & Mixins implementation.

Output

Before

Support [stack] in builder.toml, and write /cnb/stack.toml` in builder.

After

Support both [stack] and [run]/[build] tables. If both are present, [run]/[build] take precedent. Stack ID will still be accepted.

A /cnb/stack.toml will be added to the builder if a Stack ID is provided. A /cnb/run.toml may also be added to the builder if [run]/[build] are definied.

Documentation

  • Should this change be documented?
    • Yes, see #___
    • No

Related

Resolves #___

@jkutner jkutner requested review from a team as code owners March 4, 2023 22:37
@github-actions github-actions Bot added this to the 0.29.0 milestone Mar 4, 2023
@github-actions github-actions Bot added the type/enhancement Issue that requests a new feature or improvement. label Mar 4, 2023
@jkutner jkutner force-pushed the jkutner/rfc-0096 branch from 5c072f7 to 36284b6 Compare March 4, 2023 22:37
Signed-off-by: Joe Kutner <jpkutner@gmail.com>
@jkutner jkutner force-pushed the jkutner/rfc-0096 branch from 36284b6 to 6034f55 Compare March 5, 2023 16:56
jkutner added 2 commits March 20, 2023 09:30
Signed-off-by: Joe Kutner <jpkutner@gmail.com>
Copy link
Copy Markdown
Member

@natalieparellano natalieparellano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good @jkutner!

it("does not return an error", func() {
_, err := builder.New(baseImage, "some/builder")
h.AssertError(t, err, "image 'base/image' missing label 'io.buildpacks.stack.id'")
h.AssertNilE(t, err)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we error here?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@natalieparellano my thinking was that we want to allow images that don't have `io.buildpacks.stack.id label going forward

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, makes sense - I guess what threw me was the addition of and run image to the test description. I thought of a builder that is missing a run image reference.

Comment thread internal/build/container_ops.go Outdated
@natalieparellano natalieparellano linked an issue Mar 23, 2023 that may be closed by this pull request
Co-authored-by: Natalie Arellano <narellano@vmware.com>
Signed-off-by: Joe Kutner <jpkutner@gmail.com>
@dfreilich dfreilich modified the milestones: 0.29.0, 0.30.0 Mar 26, 2023
Copy link
Copy Markdown
Member

@dfreilich dfreilich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dfreilich dfreilich enabled auto-merge March 28, 2023 19:29
@dfreilich dfreilich merged commit 66b8ef9 into main Mar 28, 2023
@dfreilich dfreilich deleted the jkutner/rfc-0096 branch March 28, 2023 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

type/enhancement Issue that requests a new feature or improvement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[RFC #0096] Remove 'stacks' from builder.toml

4 participants