Skip to content

Commit ed9ffce

Browse files
authored
Merge pull request opencontainers#337 from wking/drop-tools
Drop image tools cmd/ and image/
2 parents 2331ef5 + 42b0bea commit ed9ffce

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+106
-7899
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
code-of-conduct.md
2-
/oci-image-tool
32
/oci-validate-examples
43
output

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ script:
2424
- make lint
2525
- make check-license
2626
- make test
27-
- make oci-image-tool
2827
- make docs

HACKING.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,13 @@ $ make test
3333
$ make validate-examples
3434
```
3535

36-
### OCI image tool
37-
38-
This target builds the `oci-image-tool` binary.
39-
40-
Invocation:
41-
```
42-
$ make oci-image-tool
43-
```
44-
4536
### Virtual schema http/FileSystem
4637

47-
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.
38+
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.
39+
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.
4840

49-
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`.
41+
Whenever changes are being done in any of the `schema/*.json` files, one must refresh the generated virtual file system.
42+
Otherwise schema changes will not be visible inside `schema` consumers.
5043

5144
Prerequisites:
5245
* [esc](https://github.com/mjibson/esc)

Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ help:
4949
@echo " * 'docs' - produce document in the $(OUTPUT_DIRNAME) directory"
5050
@echo " * 'fmt' - format the json with indentation"
5151
@echo " * 'validate-examples' - validate the examples in the specification markdown files"
52-
@echo " * 'oci-image-tool' - build the oci-image-tool binary"
5352
@echo " * 'schema-fs' - regenerate the virtual schema http/FileSystem"
5453
@echo " * 'check-license' - check license headers in source files"
5554
@echo " * 'lint' - Execute the source code linter"
@@ -84,9 +83,6 @@ code-of-conduct.md:
8483
validate-examples:
8584
go test -run TestValidate ./schema
8685

87-
oci-image-tool:
88-
go build ./cmd/oci-image-tool
89-
9086
schema-fs:
9187
@echo "generating schema fs"
9288
@cd schema && printf "%s\n\n%s\n" "$$(cat ../.header)" "$$(go generate)" > fs.go
@@ -139,11 +135,9 @@ install.tools: .install.gitvalidation .install.glide .install.glide-vc
139135

140136
clean:
141137
rm -rf *~ $(OUTPUT_DIRNAME)
142-
rm -f oci-image-tool
143138

144139
.PHONY: \
145140
validate-examples \
146-
oci-image-tool \
147141
check-license \
148142
clean \
149143
lint \

cmd/oci-image-tool/README.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

cmd/oci-image-tool/autodetect.go

Lines changed: 0 additions & 112 deletions
This file was deleted.

cmd/oci-image-tool/create_runtime_bundle.go

Lines changed: 0 additions & 114 deletions
This file was deleted.

cmd/oci-image-tool/main.go

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)