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

Jump to bottom

Dockerfiles phase 2 #896

Merged

natalieparellano merged 45 commits into main from extensions-phase-2

Oct 7, 2022

Member

natalieparellano commented Aug 23, 2022 •

edited

Loading

This still has many TODOs (of varying importance) but hopefully this branch can provide visibility into the current state of the work.

The most uncertain obstacle at this point to merging would be (a) general consensus on (forthcoming) spec PRs describing phase 2 changes, and (b) trying to get kaniko changes merged upstream.

What's left to do:

Validate Dockerfiles (generator.go and generator_test.go - see here)
Pass build_id as a UUID in Dockerfile build args (extender.go and extender_test.go)
Test selective.Append and selective.Write (selective/write.go)
Fix other small items marked TODO in the code
Try to get Add the ability to skip unpacking the initial file system GoogleContainerTools/kaniko#2234 merged
Try to get Provide --cache-repo as OCI image layout path GoogleContainerTools/kaniko#2250 merged
Update go.mod to remove fork

natalieparellano added 14 commits

June 29, 2022 14:06


          Consolidate logic in the platform package

6a86d08

- Remove the platform/launch package as it is not needed to avoid having the launcher depend on the lifecycle

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Reinstate platform/launch package to keep the launcher binary smaller

55548f4

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Fix constant

76374c6

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Remove comment

c91873d

Signed-off-by: Natalie Arellano <narellano@vmware.com>

WIP

Signed-off-by: Natalie Arellano <narellano@vmware.com>

WIP

e7e9b35

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Don't mount layers fixture in container

8aa4053

This way changes from the first build (/layers/config/metadata.toml, /layers/sbom, etc.)
are not propagated to the second build.

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Set environment variables from the extended build image in the build …

2bb55f7

…context

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Merge branch 'main' into extensions-phase-2

f3f4bf3


          Fix format string

d6c713f

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Restorer pulls builder manifest and config

4ef290b

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Copy extend-config.toml from extension output to /layers/generated

aa47b3d

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Merge branch 'main' into extensions-phase-2

f9fb2a5


          Only import kaniko on linux

22ee12a

Signed-off-by: Natalie Arellano <narellano@vmware.com>

natalieparellano commented

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

natalieparellano linked an issue

that may be closed by this pull request

Support Dockerfiles (phase 2) #872

Closed

natalieparellano and others added 6 commits

August 30, 2022 16:23


          WIP: units pass

Refactor buildpack build, detect, and generate to separate data model from service

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          WIP: fixed some TODOs

16f1b54

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          WIP: addressed some more TODOs, units pass

7b4acfe

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          WIP: units pass

73e0e23

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          WIP: acceptance tests pass

6dea34f

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Merge branch 'main' into extensions-phase-2

bcfca88

natalieparellano force-pushed the extensions-phase-2 branch 5 times, most recently from aad8930 to 53338d1 Compare

September 1, 2022 20:39

natalieparellano added 2 commits

September 1, 2022 16:51


          Address some minor TODOs

13d5653

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          When running extender acceptance, don't mount in /workspace directory

4667bed

This leads to incorrect permissions issues when running on linux

Signed-off-by: Natalie Arellano <narellano@vmware.com>

natalieparellano force-pushed the extensions-phase-2 branch from 53338d1 to 4667bed Compare

September 1, 2022 20:54

natalieparellano added 12 commits

September 14, 2022 11:52


          Lint

61e894d

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Add tests and TODO

f2248ba

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Change CNB_BUILDPACK_DIR -> CNB_EXTENSION_DIR

23b9e4a

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Fill in default generated dir

66e8cd1

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Ensure kaniko doesn't try to pull 'oci:/kaniko/cache/base/sha256:XXX'…

73a860d

… from a remote registry

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Add test

3ef3f38

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Merge branch 'main' into extensions-phase-2

be5f610


          Fix panic

b986d01

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Fix assertion

79284bd

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Pass build_id as UUID to Dockerfile

150cca1

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Add tests for selective package

9644a7f

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Remove kaniko fork

70ab2c8

- Fix acceptance by adding CacheRunLayers option and moving 'ARG build_id=0' statements

Signed-off-by: Natalie Arellano <narellano@vmware.com>

natalieparellano force-pushed the extensions-phase-2 branch from 3fd7bbb to 9e3266e Compare

September 28, 2022 18:26


          Fix windows

Signed-off-by: Natalie Arellano <narellano@vmware.com>

natalieparellano force-pushed the extensions-phase-2 branch from 9e3266e to 5702077 Compare

September 28, 2022 18:45

natalieparellano and others added 4 commits

September 29, 2022 14:20


          Merge branch 'main' into extensions-phase-2


          Dockerfile validation (#918)

84e5355

* Add Dockerfile Validation

Signed-off-by: Ozzy Osborne <bardweller@gmail.com>

* use mobi buildkit dockerfile parsing

Signed-off-by: Ozzy Osborne <bardweller@gmail.com>

Signed-off-by: Ozzy Osborne <bardweller@gmail.com>


          Add units for Dockerfile validation

a862921

Signed-off-by: Natalie Arellano <narellano@vmware.com>


          Merge branch 'main' into extensions-phase-2

b2bfb16

natalieparellano marked this pull request as ready for review

October 4, 2022 21:41

natalieparellano requested a review from a team as a code owner

October 4, 2022 21:41


          Fix launcher

ecf8a98

Signed-off-by: Natalie Arellano <narellano@vmware.com>

jabrown85 approved these changes

View reviewed changes

Contributor

jabrown85 left a comment

This is looking pretty great! I haven't had hands on extending anything myself at this point, but this is a great amount of work

natalieparellano added 2 commits

October 6, 2022 10:03


          Merge branch 'main' into extensions-phase-2

7e6ecad


          Minor improvements

732bce0

- Test ReadGroup for extensions
- Ensure stderr is captured for acceptance test that might expect it
- Read group.toml into an accurate struct (that has extension and optional set for extensions)
  and set these fields to false before writing out to TOML or JSON

Signed-off-by: Natalie Arellano <narellano@vmware.com>

natalieparellano force-pushed the extensions-phase-2 branch from 23fef05 to 1ba40c3 Compare

October 7, 2022 14:15


          Skip image extensions tests on Windows

42a92fa

Signed-off-by: Natalie Arellano <narellano@vmware.com>

natalieparellano force-pushed the extensions-phase-2 branch from 1ba40c3 to 42a92fa Compare

October 7, 2022 14:42

natalieparellano merged commit 2f8a818 into main

natalieparellano deleted the extensions-phase-2 branch

October 7, 2022 15:10

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment