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

Revert "Remove /lifecycle symlink created on builders" #811

Merged
merged 1 commit into from
Aug 19, 2020

Conversation

jromero
Copy link
Member

@jromero jromero commented Aug 19, 2020

Summary

Reverts changes from #763 based on larger user impact than expected based on feedback provided by Spring Boot users.

This reverts commit 5b67313.
This reverts commit bd59022.

Output

Before

$ ./out/pack create-builder my-builder -c ~/dev/buildpacks/samples/builders/alpine/builder.toml
alpine: Pulling from cnbs/sample-stack-run
21c83c524219: Pull complete
0c4331fef8cd: Pull complete
2240f5e7c4eb: Pull complete
Digest: sha256:e19e21a6902da6c23fbaecc9a89c2250264e6974994c1e4a16587031a15f67be
Status: Downloaded newer image for cnbs/sample-stack-run:alpine
alpine: Pulling from cnbs/sample-stack-build
21c83c524219: Already exists
0c4331fef8cd: Already exists
2240f5e7c4eb: Already exists
5cd7f52045a5: Pull complete
21aac71abba2: Pull complete
Digest: sha256:6045fa8d02f30d1bedbc2d99590c129d19ae7afd7aec3f67fcb390431ff27e8b
Status: Downloaded newer image for cnbs/sample-stack-build:alpine
hello-universe: Pulling from cnbs/sample-package
Digest: sha256:c797967a15cf0199d73716dd9625b6d2ffe9bece90675a83f0a6132c7395f361
Status: Image is up to date for cnbs/sample-package:hello-universe
Successfully created builder image my-builder
Tip: Run pack build <image-name> --builder my-builder to use this builder

$ docker run --rm my-builder /bin/sh -c "ls -alR /lifecycle"
ls: /lifecycle: No such file or directory

$ docker run --rm my-builder /bin/sh -c "ls -al /"
total 80
drwxr-xr-x    1 root     root          4096 Aug 19 20:12 .
drwxr-xr-x    1 root     root          4096 Aug 19 20:12 ..
-rwxr-xr-x    1 root     root             0 Aug 19 20:12 .dockerenv
drwxr-xr-x    1 root     root          4096 Aug 17 13:47 bin
drwxr-xr-x    1 root     root          4096 Aug 19 20:10 cnb
drwxr-xr-x    5 root     root           340 Aug 19 20:12 dev
drwxr-xr-x    1 root     root          4096 Aug 19 20:12 etc
drwxr-xr-x    1 root     root          4096 Aug 17 13:47 home
drwxr-xr-x    2 cnb      cnb           4096 Jan  1  1980 layers
drwxr-xr-x    1 root     root          4096 Apr 23 12:52 lib
drwxr-xr-x    5 root     root          4096 Apr 23 12:52 media
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 mnt
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 opt
drwxr-xr-x    3 root     root          4096 Jan  1  1980 platform
dr-xr-xr-x  188 root     root             0 Aug 19 20:12 proc
drwx------    2 root     root          4096 Apr 23 12:52 root
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 run
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 sbin
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 srv
dr-xr-xr-x   12 root     root             0 Aug 19 20:12 sys
drwxrwxrwt    2 root     root          4096 Apr 23 12:52 tmp
drwxr-xr-x    1 root     root          4096 Aug 17 13:47 usr
drwxr-xr-x    1 root     root          4096 Aug 17 13:47 var
drwxr-xr-x    2 cnb      cnb           4096 Jan  1  1980 workspace

After

$ ./out/pack create-builder my-builder -c ~/dev/buildpacks/samples/builders/alpine/builder.toml
alpine: Pulling from cnbs/sample-stack-run
Digest: sha256:e19e21a6902da6c23fbaecc9a89c2250264e6974994c1e4a16587031a15f67be
Status: Image is up to date for cnbs/sample-stack-run:alpine
alpine: Pulling from cnbs/sample-stack-build
Digest: sha256:6045fa8d02f30d1bedbc2d99590c129d19ae7afd7aec3f67fcb390431ff27e8b
Status: Image is up to date for cnbs/sample-stack-build:alpine
hello-universe: Pulling from cnbs/sample-package
Digest: sha256:c797967a15cf0199d73716dd9625b6d2ffe9bece90675a83f0a6132c7395f361
Status: Image is up to date for cnbs/sample-package:hello-universe
Successfully created builder image my-builder
Tip: Run pack build <image-name> --builder my-builder to use this builder

$ docker run --rm my-builder /bin/sh -c "ls -alR /lifecycle"
lrwxrwxrwx    1 root     root            14 Jan  1  1980 /lifecycle -> /cnb/lifecycle

$ docker run --rm my-builder /bin/sh -c "ls -al /"
total 80
drwxr-xr-x    1 root     root          4096 Aug 19 20:13 .
drwxr-xr-x    1 root     root          4096 Aug 19 20:13 ..
-rwxr-xr-x    1 root     root             0 Aug 19 20:13 .dockerenv
drwxr-xr-x    1 root     root          4096 Aug 17 13:47 bin
drwxr-xr-x    1 root     root          4096 Aug 19 20:12 cnb
drwxr-xr-x    5 root     root           340 Aug 19 20:13 dev
drwxr-xr-x    1 root     root          4096 Aug 19 20:13 etc
drwxr-xr-x    1 root     root          4096 Aug 17 13:47 home
drwxr-xr-x    2 cnb      cnb           4096 Jan  1  1980 layers
drwxr-xr-x    1 root     root          4096 Apr 23 12:52 lib
lrwxrwxrwx    1 root     root            14 Jan  1  1980 lifecycle -> /cnb/lifecycle
drwxr-xr-x    5 root     root          4096 Apr 23 12:52 media
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 mnt
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 opt
drwxr-xr-x    3 root     root          4096 Jan  1  1980 platform
dr-xr-xr-x  189 root     root             0 Aug 19 20:13 proc
drwx------    2 root     root          4096 Apr 23 12:52 root
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 run
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 sbin
drwxr-xr-x    2 root     root          4096 Apr 23 12:52 srv
dr-xr-xr-x   12 root     root             0 Aug 19 20:13 sys
drwxrwxrwt    2 root     root          4096 Apr 23 12:52 tmp
drwxr-xr-x    1 root     root          4096 Aug 17 13:47 usr
drwxr-xr-x    1 root     root          4096 Aug 17 13:47 var
drwxr-xr-x    2 cnb      cnb           4096 Jan  1  1980 workspace

Related

Relates to spring-projects/spring-boot#23009

This reverts commit 5b67313.

Signed-off-by: Javier Romero <[email protected]>

Revert "failing on 'should add lifecycle symlink' assertion"

This reverts commit bd59022.

Signed-off-by: Javier Romero <[email protected]>
@jromero jromero added the type/bug Issue that reports an unexpected behaviour. label Aug 19, 2020
@jromero jromero changed the base branch from main to release/0.13.1 August 19, 2020 20:07
@codecov
Copy link

codecov bot commented Aug 19, 2020

Codecov Report

Merging #811 into release/0.13.1 will decrease coverage by 0.01%.
The diff coverage is 75.00%.

Impacted file tree graph

@@                Coverage Diff                 @@
##           release/0.13.1     #811      +/-   ##
==================================================
- Coverage           77.76%   77.76%   -0.00%     
==================================================
  Files                  79       79              
  Lines                4541     4549       +8     
==================================================
+ Hits                 3531     3537       +6     
- Misses                701      702       +1     
- Partials              309      310       +1     
Flag Coverage Δ
#os_linux 77.76% <75.00%> (-<0.01%) ⬇️
#os_macos 73.80% <75.00%> (-0.04%) ⬇️
#os_windows 100.00% <ø> (ø)
#unit 77.76% <75.00%> (-<0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

@jromero jromero added this to the 0.13.1 milestone Aug 19, 2020
@jromero jromero marked this pull request as ready for review August 19, 2020 20:15
@jromero jromero requested a review from a team as a code owner August 19, 2020 20:15
@jromero jromero merged commit d04dc0f into release/0.13.1 Aug 19, 2020
@jromero jromero deleted the fix/revert-763 branch August 19, 2020 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/bug Issue that reports an unexpected behaviour.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant