diff --git a/database/pgsql/pgsql.go b/database/pgsql/pgsql.go index 94e43281..6d402c73 100644 --- a/database/pgsql/pgsql.go +++ b/database/pgsql/pgsql.go @@ -26,12 +26,12 @@ import ( "time" "bitbucket.org/liamstask/goose/lib/goose" - "github.com/cloudflare/clair/vendor/github.com/hashicorp/golang-lru" "github.com/coreos/clair/config" "github.com/coreos/clair/database" "github.com/coreos/clair/utils" cerrors "github.com/coreos/clair/utils/errors" "github.com/coreos/pkg/capnslog" + "github.com/hashicorp/golang-lru" "github.com/lib/pq" "github.com/pborman/uuid" "github.com/prometheus/client_golang/prometheus" diff --git a/vendor/github.com/coreos/clair/.dockerignore b/vendor/github.com/coreos/clair/.dockerignore new file mode 100644 index 00000000..090b49c0 --- /dev/null +++ b/vendor/github.com/coreos/clair/.dockerignore @@ -0,0 +1,7 @@ +.* +*.md +DCO +LICENSE +NOTICE +docs +cloudconfig diff --git a/vendor/github.com/coreos/clair/.travis.yml b/vendor/github.com/coreos/clair/.travis.yml new file mode 100644 index 00000000..f0d41198 --- /dev/null +++ b/vendor/github.com/coreos/clair/.travis.yml @@ -0,0 +1,29 @@ +language: go + +go: + - 1.6 + - 1.5 + - tip + +sudo: false + +before_install: + - export GO15VENDOREXPERIMENT=1 + +install: + - echo 'nop' + +script: + - go test -v $(go list ./... | grep -v /vendor/) + +services: + - postgresql + +addons: + apt: + packages: + - rpm + postgresql: "9.4" + +notifications: + email: false diff --git a/vendor/github.com/coreos/clair/CONTRIBUTING.md b/vendor/github.com/coreos/clair/CONTRIBUTING.md new file mode 100755 index 00000000..86449310 --- /dev/null +++ b/vendor/github.com/coreos/clair/CONTRIBUTING.md @@ -0,0 +1,71 @@ +# How to Contribute + +CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via +GitHub pull requests. This document outlines some of the conventions on +development workflow, commit message formatting, contact points and other +resources to make it easier to get your contribution accepted. + +# Certificate of Origin + +By contributing to this project you agree to the Developer Certificate of +Origin (DCO). This document was created by the Linux Kernel community and is a +simple statement that you, as a contributor, have the legal right to make the +contribution. See the [DCO](DCO) file for details. + +# Email and Chat + +The project currently uses the general CoreOS email list and IRC channel: +- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev) +- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org + +Please avoid emailing maintainers found in the MAINTAINERS file directly. They +are very busy and read the mailing lists. + +## Getting Started + +- Fork the repository on GitHub +- Read the [README](README.md) for build and test instructions +- Play with the project, submit bugs, submit patches! + +## Contribution Flow + +This is a rough outline of what a contributor's workflow looks like: + +- Create a topic branch from where you want to base your work (usually master). +- Make commits of logical units. +- Make sure your commit messages are in the proper format (see below). +- Push your changes to a topic branch in your fork of the repository. +- Make sure the tests pass, and add any new tests as appropriate. +- Submit a pull request to the original repository. + +Thanks for your contributions! + +### Format of the Commit Message + +We follow a rough convention for commit messages that is designed to answer two +questions: what changed and why. The subject line should feature the what and +the body of the commit should describe the why. + +``` +scripts: add the test-cluster command + +this uses tmux to setup a test cluster that you can easily kill and +start for debugging. + +Fixes #38 +``` + +The format can be described more formally as follows: + +``` +: + + + +