kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix incorrect registry key value

Browse source 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/18441
This commit is contained in:
Achilleas Pipinellis 2016-06-10 15:53:38 +02:00
parent cfc99bbd13
commit 0e7abb4c28
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/gitlab.yml.example
View file

@ -181,7 +181,7 @@ production: &base
# host: registry.example.com # host: registry.example.com
# port: 5005 # port: 5005
# api_url: http://localhost:5000/ # internal address to the registry, will be used by GitLab to directly communicate with API # api_url: http://localhost:5000/ # internal address to the registry, will be used by GitLab to directly communicate with API
# key_path: config/registry.key # key: config/registry.key
# path: shared/registry # path: shared/registry
# issuer: gitlab-issuer # issuer: gitlab-issuer

4
doc/administration/container_registry.md
View file

@ -62,7 +62,7 @@ registry:
host: registry.gitlab.example.com host: registry.gitlab.example.com
port: 5005 port: 5005
api_url: http://localhost:5000/ api_url: http://localhost:5000/
key_path: config/registry.key key: config/registry.key
path: shared/registry path: shared/registry
issuer: gitlab-issuer issuer: gitlab-issuer
``` ```
@ -75,7 +75,7 @@ where:
| `host` | The host URL under which the Registry will run and the users will be able to use. | | `host` | The host URL under which the Registry will run and the users will be able to use. |
| `port` | The port under which the external Registry domain will listen on. | | `port` | The port under which the external Registry domain will listen on. |
| `api_url` | The internal API URL under which the Registry is exposed to. It defaults to `http://localhost:5000`. | | `api_url` | The internal API URL under which the Registry is exposed to. It defaults to `http://localhost:5000`. |
| `key_path`| The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. | | `key` | The private key location that is a pair of Registry's `rootcertbundle`. Read the [token auth configuration documentation][token-config]. |
| `path` | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user. Read more in [#container-registry-storage-path](#container-registry-storage-path). | | `path` | This should be the same directory like specified in Registry's `rootdirectory`. Read the [storage configuration documentation][storage-config]. This path needs to be readable by the GitLab user, the web-server user and the Registry user. Read more in [#container-registry-storage-path](#container-registry-storage-path). |
| `issuer` | This should be the same value as configured in Registry's `issuer`. Read the [token auth configuration documentation][token-config]. | | `issuer` | This should be the same value as configured in Registry's `issuer`. Read the [token auth configuration documentation][token-config]. |