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

Drop image tools cmd/ and image/ #337

Merged
merged 2 commits into from
Oct 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
code-of-conduct.md
/oci-image-tool
/oci-validate-examples
output
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ script:
- make lint
- make check-license
- make test
- make oci-image-tool
- make docs
15 changes: 4 additions & 11 deletions HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,13 @@ $ make test
$ make validate-examples
```

### OCI image tool

This target builds the `oci-image-tool` binary.

Invocation:
```
$ make oci-image-tool
```

### Virtual schema http/FileSystem

The `oci-image-tool` uses a virtual [http/FileSystem](https://golang.org/pkg/net/http/#FileSystem) to load the JSON schema files for validating OCI images and/or manifests. The virtual file system is generated using the `esc` tool and compiled into the `oci-image-tool` binary so the JSON schema files don't have to be distributed along with the binary.
The `schema` validator uses a virtual [http/FileSystem](https://golang.org/pkg/net/http/#FileSystem) to load the JSON schema files for validating OCI images and/or manifests.
The virtual file system is generated using the `esc` tool and compiled into consumers of the `schema` package so the JSON schema files don't have to be distributed along with and consumer binaries.

Whenever changes are being done in any of the `schema/*.json` files, one must refresh the generated virtual file system. Otherwise schema changes will not be visible inside the `oci-image-tool`.
Whenever changes are being done in any of the `schema/*.json` files, one must refresh the generated virtual file system.
Otherwise schema changes will not be visible inside `schema` consumers.

Prerequisites:
* [esc](https://github.com/mjibson/esc)
Expand Down
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ help:
@echo " * 'docs' - produce document in the $(OUTPUT_DIRNAME) directory"
@echo " * 'fmt' - format the json with indentation"
@echo " * 'validate-examples' - validate the examples in the specification markdown files"
@echo " * 'oci-image-tool' - build the oci-image-tool binary"
@echo " * 'schema-fs' - regenerate the virtual schema http/FileSystem"
@echo " * 'check-license' - check license headers in source files"
@echo " * 'lint' - Execute the source code linter"
Expand Down Expand Up @@ -84,9 +83,6 @@ code-of-conduct.md:
validate-examples:
go test -run TestValidate ./schema

oci-image-tool:
go build ./cmd/oci-image-tool

schema-fs:
@echo "generating schema fs"
@cd schema && printf "%s\n\n%s\n" "$$(cat ../.header)" "$$(go generate)" > fs.go
Expand Down Expand Up @@ -139,11 +135,9 @@ install.tools: .install.gitvalidation .install.glide .install.glide-vc

clean:
rm -rf *~ $(OUTPUT_DIRNAME)
rm -f oci-image-tool

.PHONY: \
validate-examples \
oci-image-tool \
check-license \
clean \
lint \
Expand Down
24 changes: 0 additions & 24 deletions cmd/oci-image-tool/README.md

This file was deleted.

112 changes: 0 additions & 112 deletions cmd/oci-image-tool/autodetect.go

This file was deleted.

114 changes: 0 additions & 114 deletions cmd/oci-image-tool/create_runtime_bundle.go

This file was deleted.

41 changes: 0 additions & 41 deletions cmd/oci-image-tool/main.go

This file was deleted.

Loading