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

fix: update docker media type in registry #2476

Merged
merged 3 commits into from
May 3, 2024
Merged

fix: update docker media type in registry #2476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b05250
update docker mime type
AustinAbro321 May 3, 2024
bc06852
new injector version
AustinAbro321 May 3, 2024
c46698b
rename vars
AustinAbro321 May 3, 2024
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
6 changes: 3 additions & 3 deletions src/injector/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use serde_json::Value;
use sha2::{Digest, Sha256};
use tar::Archive;

const DOCKER_MIME_TYPE: &str = "application/vnd.docker.distribution.manifest.v2+json";
const OCI_MIME_TYPE: &str = "application/vnd.oci.image.manifest.v1+json";

// Reads the binary contents of a file
fn get_file(path: &PathBuf) -> io::Result<Vec<u8>> {
Expand Down Expand Up @@ -140,7 +140,7 @@ fn handle_request(root: &Path, request: &Request) -> Response {
// on Content-Length, we respond the same as a GET
return accept!(
request,
DOCKER_MIME_TYPE => {
OCI_MIME_TYPE => {
handle_get_manifest(&root, &namespaced_name, &tag_or_digest)
},
"*/*" => Response::empty_406()
Expand Down Expand Up @@ -183,7 +183,7 @@ fn handle_get_manifest(root: &Path, name: &String, tag: &String) -> Response {

if sha_manifest != "" {
let file = File::open(&root.join("blobs").join("sha256").join(&sha_manifest)).unwrap();
Response::from_file(DOCKER_MIME_TYPE, file)
Response::from_file(OCI_MIME_TYPE, file)
.with_additional_header(
"Docker-Content-Digest",
format!("sha256:{}", sha_manifest.to_owned()),
Expand Down
6 changes: 3 additions & 3 deletions zarf-config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ agent_image = 'defenseunicorns/zarf/agent'
agent_image_tag = 'local'

# Tag for the zarf injector binary to use
injector_version = '2023-08-02'
injector_amd64_shasum = '91de0768855ee2606a4f85a92bb480ff3a14ca205fd8d05eb397c18e15aa0247'
injector_arm64_shasum = '663df681deea957b0ec53538eab221691a83de8e95d86b8a29008af711934bee'
injector_version = '2024-05-03'
injector_amd64_shasum = 'e5a3d380bac4bf6c68ba18275d6a92bb002e86c116eb364f960d393fd2f44da8'
injector_arm64_shasum = 'f7f26e37a514f2ca36d795b7611d64491398a4bdc424e0045875af391dc28659'

# The image reference to use for the registry that Zarf deploys into the cluster
registry_image_domain = ''
Expand Down
Loading