From f0c5284d2d99065fdfa85f1b61bdc270844881a0 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Thu, 30 Jul 2015 12:12:22 -0700 Subject: [PATCH] Sample config file changes Rename config.yml to dev-config.yml Add example-config.yml, a simple configuration file for the official This was originally made for the the distribution-library-image repo, but is being moved here to make sure it stays in sync. Update Dockerfile and docs for the rename. Signed-off-by: Aaron Lehmann --- Dockerfile | 2 +- cmd/registry/{config.yml => dev-config.yml} | 0 cmd/registry/example-config.yml | 14 ++++++++++++++ docs/building.md | 2 +- docs/configuration.md | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) rename cmd/registry/{config.yml => dev-config.yml} (100%) create mode 100644 cmd/registry/example-config.yml diff --git a/Dockerfile b/Dockerfile index 66e568e4..d367e1d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,4 +15,4 @@ RUN make PREFIX=/go clean binaries VOLUME ["/var/lib/registry"] EXPOSE 5000 ENTRYPOINT ["registry"] -CMD ["cmd/registry/config.yml"] +CMD ["cmd/registry/dev-config.yml"] diff --git a/cmd/registry/config.yml b/cmd/registry/dev-config.yml similarity index 100% rename from cmd/registry/config.yml rename to cmd/registry/dev-config.yml diff --git a/cmd/registry/example-config.yml b/cmd/registry/example-config.yml new file mode 100644 index 00000000..99161273 --- /dev/null +++ b/cmd/registry/example-config.yml @@ -0,0 +1,14 @@ +version: 0.1 +log: + fields: + service: registry +storage: + cache: + layerinfo: inmemory + filesystem: + rootdirectory: /var/lib/registry + maintenance: + uploadpurging: + enabled: false +http: + addr: :5000 diff --git a/docs/building.md b/docs/building.md index bbf9cc0b..2a0c226e 100644 --- a/docs/building.md +++ b/docs/building.md @@ -45,7 +45,7 @@ The registry can be run with the default config using the following incantantation: ``` -$ $GOPATH/bin/registry $GOPATH/src/github.com/docker/distribution/cmd/registry/config.yml +$ $GOPATH/bin/registry $GOPATH/src/github.com/docker/distribution/cmd/registry/dev-config.yml INFO[0000] endpoint local-5003 disabled, skipping app.id=34bbec38-a91a-494a-9a3f-b72f9010081f version=v2.0.0-alpha.1+unknown INFO[0000] endpoint local-8083 disabled, skipping app.id=34bbec38-a91a-494a-9a3f-b72f9010081f version=v2.0.0-alpha.1+unknown INFO[0000] listening on :5000 app.id=34bbec38-a91a-494a-9a3f-b72f9010081f version=v2.0.0-alpha.1+unknown diff --git a/docs/configuration.md b/docs/configuration.md index b45f7da1..8ecc6d63 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1552,7 +1552,7 @@ The above configures the registry instance to run on port `5000`, binding to verbose. A similar simple configuration is available at -[config.yml](https://github.com/docker/distribution/blob/master/cmd/registry/config.yml). +[example-config.yml](https://github.com/docker/distribution/blob/master/cmd/registry/example-config.yml). Both are generally useful for local development.