update config for 1.2.0 configuration (#84)

* update config for 1.2.0 configuration

* bump version 0.5.2

VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

contrib/clair/config/config.yml

@@ -15,13 +15,16 @@
 # The values specified here are the default values that Clair uses if no configuration file is specified or if the keys are not defined.
 clair:
   database:
-    # PostgreSQL Connection string
-    # http://www.postgresql.org/docs/9.4/static/libpq-connect.html
-    source: postgresql://postgres:root@postgres:5432?sslmode=disable
+    # Database driver
+    type: pgsql
+    options:
+      # PostgreSQL Connection string
+      # http://www.postgresql.org/docs/9.4/static/libpq-connect.html
+      source: postgresql://postgres:root@postgres:5432?sslmode=disable
 
-    # Number of elements kept in the cache
-    # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database.
-    cacheSize: 16384
+      # Number of elements kept in the cache
+      # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database.
+      cachesize: 16384
 
   api:
     # API server port
@@ -37,7 +40,7 @@ clair:
     # 32-bit URL-safe base64 key used to encrypt pagination tokens
     # If one is not provided, it will be generated.
     # Multiple clair instances in the same cluster need the same value.
-    paginationKey:
+    paginationkey:
 
     # Optional PKI configuration
     # If you want to easily generate client certificates and CAs, try the following projects:
@@ -51,14 +54,14 @@ clair:
   updater:
     # Frequency the database will be updated with vulnerabilities from the default data sources
     # The value 0 disables the updater entirely.
-    interval: 0
+    interval: 2h
 
   notifier:
     # Number of attempts before the notification is marked as failed to be sent
     attempts: 3
 
     # Duration before a failed notification is retried
-    renotifyInterval: 2h
+    renotifyinterval: 2h
 
     http:
       # Optional endpoint that will receive notifications via POST requests
@@ -74,4 +77,4 @@ clair:
       certfile:
 
       # Optional HTTP Proxy: must be a valid URL (including the scheme).
-      proxy:
+      proxy:

contrib/config/clair.yml

@@ -15,13 +15,16 @@
 # The values specified here are the default values that Clair uses if no configuration file is specified or if the keys are not defined.
 clair:
   database:
-    # PostgreSQL Connection string
-    # http://www.postgresql.org/docs/9.4/static/libpq-connect.html
-    source: postgresql://postgres:root@postgres:5432?sslmode=disable
+    # Database driver
+    type: pgsql
+    options:
+      # PostgreSQL Connection string
+      # http://www.postgresql.org/docs/9.4/static/libpq-connect.html
+      source: postgresql://postgres:root@postgres:5432?sslmode=disable
 
-    # Number of elements kept in the cache
-    # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database.
-    cacheSize: 16384
+      # Number of elements kept in the cache
+      # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database.
+      cachesize: 16384
 
   api:
     # API server port
@@ -37,7 +40,7 @@ clair:
     # 32-bit URL-safe base64 key used to encrypt pagination tokens
     # If one is not provided, it will be generated.
     # Multiple clair instances in the same cluster need the same value.
-    paginationKey:
+    paginationkey:
 
     # Optional PKI configuration
     # If you want to easily generate client certificates and CAs, try the following projects:
@@ -51,14 +54,14 @@ clair:
   updater:
     # Frequency the database will be updated with vulnerabilities from the default data sources
     # The value 0 disables the updater entirely.
-    interval: 0
+    interval: 2h
 
   notifier:
     # Number of attempts before the notification is marked as failed to be sent
     attempts: 3
 
     # Duration before a failed notification is retried
-    renotifyInterval: 2h
+    renotifyinterval: 2h
 
     http:
       # Optional endpoint that will receive notifications via POST requests
@@ -74,4 +77,4 @@ clair:
       certfile:
 
       # Optional HTTP Proxy: must be a valid URL (including the scheme).
-      proxy:
+      proxy:

contrib/docker-compose.yml

@@ -30,13 +30,14 @@ services:
   clair:
     image: quay.io/coreos/clair
     volumes:
+      - ./config:/config
       - /tmp:/tmp
       - clair-data:/var/local
     ports:
       - 6060:6060
       - 6061:6061
     container_name: "clair"
-    command: --log-level=debug --config=/config/config.yml
+    command: --log-level=debug --config=/config/clair.yml
     # entrypoint: bash
     # tty: true