Skip to content

Commit

Permalink
fix(action/clair): fix dep docker (#3745)
Browse files Browse the repository at this point in the history
Signed-off-by: Yvonnick Esnault <[email protected]>
  • Loading branch information
yesnault authored and bnjjj committed Dec 18, 2018
1 parent 3b9fb35 commit 9027f10
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 45 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ mod:
@echo "running go mod vendor..." && GO111MODULE=on go mod vendor
@echo "running go mod tidy... SKIPPED "# && GO111MODULE=on go mod tidy
@echo "doing some clean in vendor directory..." && find vendor -type f ! \( -name 'modules.txt' -o -name '*.sum' -o -name '*.mod' -o -name '*.rst' -o -name '*.go' -o -name '*.y' -o -name '*.h' -o -name '*.c' -o -name '*.proto' -o -name '*.tmpl' -o -name '*.s' -o -name '*.pl' \) -exec rm {} \;
# two calls to RegisterManifestSchema(ocispec.MediaTypeImageIndex -> panic
# file oci.go is in conflict with file /vendor/github.com/docker/distribution/manifest/manifestlist/manifestlist.go
# when docker update their vendor, it will be possible to remove this line.
# this will fix the plugin-clair for the moment
@echo "removing file /vendor/github.com/docker/docker/distribution/oci.go..." && rm -f vendor/github.com/docker/docker/distribution/oci.go

install:
go install -v $$(go list ./... | grep -v vendor)
45 changes: 0 additions & 45 deletions vendor/github.com/docker/docker/distribution/oci.go

This file was deleted.

0 comments on commit 9027f10

Please sign in to comment.