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.

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

Add .cnb file support for package-buildpack dependencies #633

Merged
merged 6 commits into from
May 20, 2020

Conversation

dfreilich
Copy link
Member

@dfreilich dfreilich requested a review from a team as a code owner May 18, 2020 19:11
@codecov
Copy link

codecov bot commented May 18, 2020

Codecov Report

Merging #633 into master will increase coverage by 0.04%.
The diff coverage is 85.72%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #633      +/-   ##
==========================================
+ Coverage   70.48%   70.52%   +0.04%     
==========================================
  Files          67       67              
  Lines        4671     4687      +16     
==========================================
+ Hits         3292     3305      +13     
- Misses       1061     1063       +2     
- Partials      318      319       +1     
Flag Coverage Δ
#os_linux 73.20% <88.89%> (+0.04%) ⬆️
#os_macos 69.20% <88.89%> (+0.05%) ⬆️
#os_windows 69.07% <85.72%> (+0.05%) ⬆️
#unit 70.52% <85.72%> (+0.04%) ⬆️

@dfreilich dfreilich force-pushed the 586-support-cnb-files-package-buildpack branch from 37a31da to 204a046 Compare May 18, 2020 19:19
@dfreilich dfreilich requested a review from jromero May 18, 2020 19:40
package_buildpack.go Outdated Show resolved Hide resolved
package_buildpack.go Outdated Show resolved Hide resolved
@dfreilich dfreilich force-pushed the 586-support-cnb-files-package-buildpack branch from 204a046 to cc62616 Compare May 19, 2020 14:20
Copy link
Member

@jromero jromero left a comment

Choose a reason for hiding this comment

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

Minor tweaks in testing.

package_buildpack_test.go Outdated Show resolved Hide resolved
package_buildpack_test.go Outdated Show resolved Hide resolved
@dfreilich dfreilich force-pushed the 586-support-cnb-files-package-buildpack branch 2 times, most recently from 3f4d22f to ed7971f Compare May 19, 2020 20:38
* Remove extraneous assertions when asserting about PackageBPFile

Signed-off-by: David Freilich <[email protected]>
@dfreilich dfreilich force-pushed the 586-support-cnb-files-package-buildpack branch from 776a625 to 44a9f8c Compare May 19, 2020 21:26
@jromero
Copy link
Member

jromero commented May 20, 2020

✔️ Accepted

$ ./out/pack package-buildpack hello-world.cnb --format file -p ~/dev/buildpacks/samples/packages/hello-world/package.toml
Successfully created package hello-world.cnb

$ cat ~/dev/buildpacks/samples/packages/hello-universe/package.toml 
[buildpack]
uri = "../../buildpacks/hello-universe/"

[[dependencies]]
uri = "../../buildpacks/hello-moon"

[[dependencies]]
uri = "/Users/javier.romero/dev/buildpacks/pack/hello-world.cnb"

$ ./out/pack package-buildpack hello-universe.cnb --format file -p ~/dev/buildpacks/samples/packages/hello-universe/package.toml 
Successfully created package hello-universe.cnb

$ ./out/pack build my-app-586 -B cnbs/sample-builder:alpine -b hello-universe.cnb 
alpine: Pulling from cnbs/sample-builder
Digest: sha256:b12fef6427956b670aa3b9ff91daee19b927200dbf6bbb6171bf98be3360e8d7
Status: Image is up to date for cnbs/sample-builder:alpine
alpine: Pulling from cnbs/sample-stack-run
Digest: sha256:ff5952abb5476176ddd68790c1ba69ef0114f701c0565acc94ad067100571449
Status: Image is up to date for cnbs/sample-stack-run:alpine
Warning: buildpack samples/[email protected] already exists on builder and will be overwritten
Warning: buildpack samples/[email protected] already exists on builder and will be overwritten
Warning: buildpack samples/[email protected] already exists on builder and will be overwritten
===> CREATING
[creator] ---> DETECTING
[creator] samples/hello-world 0.0.1
[creator] samples/hello-moon  0.0.1
[creator] ---> ANALYZING
[creator] Previous image with name "index.docker.io/library/my-app-586:latest" not found
[creator] ---> RESTORING
[creator] ---> BUILDING
[creator] ---> Hello World buildpack
[creator]      env_dir: /platform/env
[creator]      env vars:
[creator]        declare -x CNB_STACK_ID="io.buildpacks.samples.stacks.alpine"
[creator]        declare -x HOME="/home/cnb"
[creator]        declare -x HOSTNAME="65065b6f7957"
[creator]        declare -x OLDPWD
[creator]        declare -x PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
[creator]        declare -x PWD="/workspace"
[creator]        declare -x SHLVL="1"
[creator]      layers_dir: /layers/samples_hello-world
[creator]      plan_path: /tmp/plan.131761026/samples_hello-world/plan.toml
[creator]      plan contents:
[creator]        [[entries]]
[creator]          name = "some-world"
[creator]          version = ""
[creator]        
[creator]        [[entries]]
[creator]          name = "some-world"
[creator]          version = "0.1"
[creator]          [entries.metadata]
[creator]            world = "Earth-616"
[creator] 
[creator] ---> Done
[creator] ---> Hello Moon buildpack
[creator]      env_dir: /platform/env
[creator]      env vars:
[creator]        declare -x CNB_STACK_ID="io.buildpacks.samples.stacks.alpine"
[creator]        declare -x HOME="/home/cnb"
[creator]        declare -x HOSTNAME="65065b6f7957"
[creator]        declare -x OLDPWD
[creator]        declare -x PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
[creator]        declare -x PWD="/workspace"
[creator]        declare -x SHLVL="1"
[creator]      layers_dir: /layers/samples_hello-moon
[creator]      plan_path: /tmp/plan.131761026/samples_hello-moon/plan.toml
[creator]      plan contents:
[creator] 
[creator] ---> Done
[creator] ---> EXPORTING
[creator] Adding layer 'launcher'
[creator] Adding 1/1 app layer(s)
[creator] Adding layer 'config'
[creator] *** Images (0cf8a4e084c0):
[creator]       index.docker.io/library/my-app-586:latest
Successfully built image my-app-586

@jromero jromero merged commit 3b98dd6 into master May 20, 2020
@jromero jromero deleted the 586-support-cnb-files-package-buildpack branch May 20, 2020 02:14
@jromero jromero added this to the 0.11.0 milestone May 20, 2020
@jromero jromero added the type/enhancement Issue that requests a new feature or improvement. label May 22, 2020
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.

Support .cnb files in package-buildpack package.toml
2 participants