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.

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

Point to Zarf ref with OCI fix #23

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Point to Zarf ref with OCI fix #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb1782f
WIP investigating
UncleGedd Aug 25, 2023
1636a33
point to Zarf branch with OCI-related fix
UncleGedd Aug 25, 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
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ module github.com/defenseunicorns/uds-cli

go 1.19

replace github.com/defenseunicorns/zarf => github.com/defenseunicorns/zarf v0.29.1-0.20230825161338-d03c3e539b87

// TODO (@WSTARR) remove this temporary replacement of oras-go 1.2.2 with defenseunicorns version due to upgraded docker lib
replace oras.land/oras-go v1.2.3 => github.com/defenseunicorns/oras-go v1.2.4-0.20230605015028-85c595ed4b64

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,8 @@ github.com/daviddengcn/go-colortext v1.0.0 h1:ANqDyC0ys6qCSvuEK7l3g5RaehL/Xck9EX
github.com/daviddengcn/go-colortext v1.0.0/go.mod h1:zDqEI5NVUop5QPpVJUxE9UO10hRnmkD5G4Pmri9+m4c=
github.com/defenseunicorns/oras-go v1.2.4-0.20230605015028-85c595ed4b64 h1:SCwmnKa2RSZtW50bKudiPdYUucX3xqlbbUt8AJiu5SA=
github.com/defenseunicorns/oras-go v1.2.4-0.20230605015028-85c595ed4b64/go.mod h1:9YC1InrDJmkX0HhBLTXIixGH+l8bsPjRURmmaI2TvBk=
github.com/defenseunicorns/zarf v0.29.0 h1:NcI/iGU2oYflaccIxsLkAYMI6vhYC8qC3n+lPsGDmYE=
github.com/defenseunicorns/zarf v0.29.0/go.mod h1:q1BnqTjMgyPh7mN++KcXRmHGVxN2mjgPS2GdxVKkwSw=
github.com/defenseunicorns/zarf v0.29.1-0.20230825161338-d03c3e539b87 h1:oKjzUfVGJQ1sQ0RQtW/oQg5kg1sdtSRIKItBm6t4pv4=
github.com/defenseunicorns/zarf v0.29.1-0.20230825161338-d03c3e539b87/go.mod h1:q1BnqTjMgyPh7mN++KcXRmHGVxN2mjgPS2GdxVKkwSw=
github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da h1:ZOjWpVsFZ06eIhnh4mkaceTiVoktdU67+M7KDHJ268M=
github.com/deitch/magic v0.0.0-20230404182410-1ff89d7342da/go.mod h1:B3tI9iGHi4imdLi4Asdha1Sc6feLMTfPLXh9IUYmysk=
github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
Expand Down
4 changes: 2 additions & 2 deletions src/pkg/bundler/bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ func Bundle(b *Bundler, signature []byte) error {
if err != nil {
return err
}

//// hack media type??
//zarfYamlDesc.MediaType = ocispec.MediaTypeImageManifest
// append zarf pkg manifest to root manifest and grab path for archiving
rootManifest.Layers = append(rootManifest.Layers, zarfYamlDesc)
digest := strings.Split(zarfYamlDesc.Digest.String(), "sha256:")[1]
artifactPathMap[filepath.Join(b.tmp, config.BlobsDir, digest)] = filepath.Join(config.BlobsDir, digest)

message.Debugf("Pushed %s sub-manifest into %s: %s", url, b.tmp, message.JSONValue(zarfYamlDesc))

// get only the layers that are required by the components
layersToCopy, err := getZarfLayers(remote, pkg, pkgRootManifest)
spinner := message.NewProgressSpinner("Fetching layers from %s", remote.Repo().Reference.Repository)
Expand Down