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

MZOCI - Make Zarf OCI (Take #2) #1423

Merged
merged 77 commits into from
Mar 15, 2023
Merged
Changes from 1 commit
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
03fd619
1322 component tarballs (#1331)
YrrepNoj Feb 13, 2023
686b7cf
deletes tar.zst of components after unarchive (#1385)
wirewc Feb 27, 2023
2a8a867
Create a `zarf package publish` command (#1336)
Noxsios Mar 1, 2023
247b449
1324 images tar now expanded (#1359)
YrrepNoj Mar 1, 2023
d398f57
properly re-create components layers when publishing packages
YrrepNoj Feb 28, 2023
20ec44e
Update src/pkg/packager/common.go
Noxsios Mar 1, 2023
f752c34
Update src/pkg/packager/common.go
Noxsios Mar 1, 2023
a135776
re-order defaults so that they get picked up properly
Noxsios Mar 1, 2023
d7343a7
refactor oras remote
Noxsios Mar 2, 2023
2e7a434
archive pulled packages without including temp directory
YrrepNoj Mar 2, 2023
f67ff77
start adding e2e tests for oci stuffs
Noxsios Mar 3, 2023
439ab99
use e2e.arch
Noxsios Mar 3, 2023
0388330
some clarity during big memory stores
Noxsios Mar 3, 2023
32ef564
tests
Noxsios Mar 3, 2023
0f6aafc
tests
Noxsios Mar 3, 2023
09a5592
do not compress component layers within a package
YrrepNoj Mar 3, 2023
d518c52
fix tests
Noxsios Mar 3, 2023
fee547c
login does not have --password, use -p
Noxsios Mar 3, 2023
60d6d39
add back the progress bar for pulling images when creating a package
YrrepNoj Mar 3, 2023
9a1d6d8
add back the --decompress-all flag for git tests
YrrepNoj Mar 3, 2023
b872733
log the correct error message when unable to get dir size
YrrepNoj Mar 3, 2023
e439285
http roundtripper progress bar w/ oras
Noxsios Mar 4, 2023
0ddb3bb
some output cleanup
Noxsios Mar 4, 2023
30383da
this probably makes things even more complicated...
Noxsios Mar 5, 2023
daa9dbc
fix tests + cleanup some cli output
Noxsios Mar 6, 2023
aa784aa
add progress bar for pulling a published zarf package
YrrepNoj Mar 6, 2023
839395f
repackage components into a tarball when publishing (instead of tar.zst)
YrrepNoj Mar 7, 2023
36010c9
fix e2e test that validate oci functionality
YrrepNoj Mar 7, 2023
d84d2f3
Apply suggestions from code review by @Racer159
Noxsios Mar 7, 2023
d797925
clean up clean up, everybody clean up
YrrepNoj Mar 7, 2023
ba46179
create utility for creating a progress bar for local file saves
YrrepNoj Mar 7, 2023
908e819
make inspect oci:// like inspect
Noxsios Mar 7, 2023
b4dfd21
use new utils fn
Noxsios Mar 7, 2023
256cb52
update inspect test
Noxsios Mar 7, 2023
9da6588
fix inspect
Noxsios Mar 7, 2023
3eebe46
update docs
Noxsios Mar 8, 2023
6daa3a2
concurrency --> oci-concurrency
Noxsios Mar 8, 2023
56639da
removed uneeded gitignore
Noxsios Mar 8, 2023
a8fdcbc
no more precopy
Noxsios Mar 8, 2023
b6f1126
linting
Noxsios Mar 8, 2023
a8ff4bc
better isManifestUnsupported handling
Noxsios Mar 8, 2023
76d6045
docs
Noxsios Mar 8, 2023
9ff8434
Fix the period on a comment in create.go
Racer159 Mar 8, 2023
f391a9e
Fix decompressLayers
Racer159 Mar 8, 2023
48a04a6
Fix decompressLayers
Racer159 Mar 8, 2023
fad5306
remove gif and tape
Noxsios Mar 8, 2023
a8cb37d
feedback
Noxsios Mar 8, 2023
42254b6
docs
Noxsios Mar 8, 2023
769c8cb
docs
Noxsios Mar 8, 2023
08f8bf5
Merge branch 'main' into features/oci-package
Racer159 Mar 8, 2023
b6732ca
remove referrers for image manifest, we are not doing nested manifests
Noxsios Mar 8, 2023
e718629
docs
Noxsios Mar 8, 2023
ed478fd
refactor inspect
Noxsios Mar 9, 2023
c317275
some pre-commit stuff
Noxsios Mar 9, 2023
a8063e4
fix podinfo test
Noxsios Mar 10, 2023
2dae9cc
linting
Noxsios Mar 10, 2023
e8dfae6
docs and schema
Noxsios Mar 10, 2023
2ccaeec
docs and schema
Noxsios Mar 10, 2023
7ac27c7
decompress sboms when the --decompress-all flag is provided
YrrepNoj Mar 10, 2023
6551d39
add json utility to write files to disk
YrrepNoj Mar 10, 2023
c4433ba
refactor and rename progress bar for local dir writes
YrrepNoj Mar 10, 2023
462766e
init adr
Noxsios Mar 10, 2023
c032897
remove sbom tar after decompressing the layers
YrrepNoj Mar 10, 2023
d11e78e
Merge branch 'main' into features/oci-package
Racer159 Mar 11, 2023
c8670f1
retry removals of directories that have been recently archived b/c of…
YrrepNoj Mar 13, 2023
7904435
unarchive the sboms into an sbom directory when deploying a package
YrrepNoj Mar 13, 2023
c1fce23
start adr for zarf pacakge structure updates
YrrepNoj Mar 13, 2023
ab701b3
update adr
Noxsios Mar 13, 2023
e73f052
actually check the right location for the package SBOM contents..
YrrepNoj Mar 13, 2023
adedb69
double the wait, i hate this
Noxsios Mar 14, 2023
b95f47e
Merge branch 'main' into features/oci-package
Racer159 Mar 14, 2023
bfd9ef2
update go.mod to use forked syft to fix file close bug
YrrepNoj Mar 14, 2023
23f07f8
grab oras default retry client
Noxsios Mar 14, 2023
923919c
no more need to have retry remove since the file handle is getting pr…
Noxsios Mar 14, 2023
0c5aa6c
fix visual glitches on proress bar
Noxsios Mar 14, 2023
552902a
make sbom functionality more backwards compatable with older zarf pac…
YrrepNoj Mar 14, 2023
0e251ac
fix bug with showing/outputting sbom content when creating a package
YrrepNoj Mar 15, 2023
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
Prev Previous commit
Next Next commit
repackage components into a tarball when publishing (instead of tar.zst)
YrrepNoj authored and Racer159 committed Mar 8, 2023
commit 839395f4162405551f80aaf42ea8b8788e7846b9
11 changes: 7 additions & 4 deletions src/pkg/packager/publish.go
Original file line number Diff line number Diff line change
@@ -70,9 +70,9 @@ func (p *Packager) Publish() error {
Structure:
.
├── components/
│   ├── component1.tar.zst
│   ├── component2.tar.zst
│   └── [...].tar.zst
│   ├── component1.tar
│   ├── component2.tar
│   └── [...].tar
├── images/
│   ├── index.json
│   ├── oci-layout
@@ -112,9 +112,12 @@ func (p *Packager) Publish() error {
return err
}
componentTarballs := []string{}

message.Warnf("@JPERRY: all the contents of the components directory: %#v", componentDirs)

// repackage the component directories into tarballs
for _, componentDir := range componentDirs {
dst := filepath.Join(p.tmp.Components, filepath.Base(componentDir)+".tar.zst")
dst := filepath.Join(p.tmp.Components, filepath.Base(componentDir)+".tar")
err = archiver.Archive([]string{componentDir}, dst)
if err != nil {
return err