Saner default data location

Signed-off-by: Olivier Gambier <olivier@docker.com>
This commit is contained in:
Olivier Gambier 2015-06-10 20:54:24 -07:00
parent 7363323321
commit 6e0cfc17dc
5 changed files with 10 additions and 12 deletions

View file

@ -22,7 +22,7 @@ storage:
cache: cache:
blobdescriptor: redis blobdescriptor: redis
filesystem: filesystem:
rootdirectory: /tmp/registry-dev rootdirectory: /var/lib/registry
maintenance: maintenance:
uploadpurging: uploadpurging:
enabled: false enabled: false

View file

@ -21,16 +21,16 @@ configure the `rootdirectory` of the `filesystem` storage backend:
``` ```
storage: storage:
filesystem: filesystem:
rootdirectory: /tmp/registry-dev rootdirectory: /var/lib/registry
``` ```
To override this value, set an environment variable like this: To override this value, set an environment variable like this:
``` ```
REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/tmp/registry/test REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/somewhere
``` ```
This variable overrides the `/tmp/registry-dev` value to the `/tmp/registry/test` This variable overrides the `/var/lib/registry` value to the `/somewhere`
directory. directory.
>**Note**: If an environment variable changes a map value into a string, such >**Note**: If an environment variable changes a map value into a string, such
@ -72,7 +72,7 @@ log:
loglevel: debug # deprecated: use "log" loglevel: debug # deprecated: use "log"
storage: storage:
filesystem: filesystem:
rootdirectory: /tmp/registry-dev rootdirectory: /var/lib/registry
azure: azure:
accountname: accountname accountname: accountname
accountkey: base64encodedaccountkey accountkey: base64encodedaccountkey
@ -284,7 +284,7 @@ Permitted values are `error`, `warn`, `info` and `debug`. The default is
```yaml ```yaml
storage: storage:
filesystem: filesystem:
rootdirectory: /tmp/registry rootdirectory: /var/lib/registry
azure: azure:
accountname: accountname accountname: accountname
accountkey: base64encodedaccountkey accountkey: base64encodedaccountkey
@ -1342,7 +1342,7 @@ log:
level: debug level: debug
storage: storage:
filesystem: filesystem:
rootdirectory: /tmp/registry-dev rootdirectory: /var/lib/registry
http: http:
addr: localhost:5000 addr: localhost:5000
secret: asecretforlocaldevelopment secret: asecretforlocaldevelopment
@ -1352,7 +1352,7 @@ http:
The above configures the registry instance to run on port `5000`, binding to The above configures the registry instance to run on port `5000`, binding to
`localhost`, with the `debug` server enabled. Registry data storage is in the `localhost`, with the `debug` server enabled. Registry data storage is in the
`/tmp/registry-dev` directory. Logging is in `debug` mode, which is the most `/var/lib/registry` directory. Logging is in `debug` mode, which is the most
verbose. verbose.
A similar simple configuration is available at A similar simple configuration is available at

View file

@ -17,7 +17,6 @@ Create a folder for your registry data:
Start your registry: Start your registry:
$ docker run -d -p 5000:5000 \ $ docker run -d -p 5000:5000 \
-v `pwd`/registry-data:/tmp/registry-dev \
--restart=always --name registry registry:2 --restart=always --name registry registry:2
That's it. That's it.
@ -62,7 +61,6 @@ docker stop registry && docker rm registry
# Start your registry with TLS enabled # Start your registry with TLS enabled
docker run -d -p 5000:5000 \ docker run -d -p 5000:5000 \
-v `pwd`/registry-data:/tmp/registry-dev \
-v `pwd`/certs:/certs \ -v `pwd`/certs:/certs \
-e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt \ -e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt \
-e REGISTRY_HTTP_TLS_KEY=/certs/domain.key \ -e REGISTRY_HTTP_TLS_KEY=/certs/domain.key \

View file

@ -10,4 +10,4 @@ An implementation of the `storagedriver.StorageDriver` interface which uses the
## Parameters ## Parameters
`rootdirectory`: (optional) The root directory tree in which all registry files will be stored. Defaults to `/tmp/registry/storage`. `rootdirectory`: (optional) The root directory tree in which all registry files will be stored. Defaults to `/var/lib/registry`.

View file

@ -16,7 +16,7 @@ import (
) )
const driverName = "filesystem" const driverName = "filesystem"
const defaultRootDirectory = "/tmp/registry/storage" const defaultRootDirectory = "/var/lib/registry"
func init() { func init() {
factory.Register(driverName, &filesystemDriverFactory{}) factory.Register(driverName, &filesystemDriverFactory{})