diff --git a/Changelog.md b/Changelog.md index 54e8e05a..a6105dcc 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,6 +4,17 @@ This file only reflects the changes that are made in this image. Please refer to **8.17.0** - gitlab: upgrade to CE v8.17.0 +- added `GITLAB_PAGES_ENABLED` +- added `GITLAB_PAGES_DOMAIN` +- added `GITLAB_PAGES_DIR` +- added `GITLAB_PAGES_PORT` +- added `GITLAB_PAGES_HTTPS` +- added `GITLAB_PAGES_EXTERNAL_HTTP` +- added `GITLAB_PAGES_EXTERNAL_HTTPS` +- added `SSL_PAGES_KEY_PATH` +- added `SSL_PAGES_CERT_PATH` +- added nodejs 7.x as core dependencie +- added gitlab-pages daemon **8.16.6** - gitlab: upgrade to CE v8.16.6 diff --git a/README.md b/README.md index f6242c5a..e304a262 100644 --- a/README.md +++ b/README.md @@ -869,6 +869,13 @@ Below is the complete list of available options that can be used to customize yo | `GITLAB_REGISTRY_KEY_PATH` | Sets the GitLab Registry Key Path. Defaults to `config/registry.key` | | `GITLAB_REGISTRY_DIR` | Directory to store the container images will be shared with registry. Defaults to `$GITLAB_SHARED_DIR/registry` | | `GITLAB_REGISTRY_ISSUER` | Sets the GitLab Registry Issuer. Defaults to `gitlab-issuer`. | +| `GITLAB_PAGES_ENABLED` | Enables the GitLab Pages. Defaults to `false`. | +| `GITLAB_PAGES_DOMAIN` | Sets the GitLab Pages Domain. Defaults to `example.com` | +| `GITLAB_PAGES_DIR` | Sets GitLab Pages directory where all pages will be stored. Defaults to `$GITLAB_SHARED_DIR/pages` | +| `GITLAB_PAGES_PORT`| Sets GitLab Pages Port that will be used in NGINX. Defaults to `80` | +| `GITLAB_PAGES_HTTPS` | Sets GitLab Pages to HTTPS and the gitlab-pages-ssl config will be used. Defaults to `false` | +| `GITLAB_PAGES_EXTERNAL_HTTP` | Sets GitLab Pages external http to receive request on an independen port. Disabled by default | +| `GITLAB_PAGES_EXTERNAL_HTTPS` | Sets GitLab Pages external https to receive request on an independen port. Disabled by default | | `GITLAB_HTTPS` | Set to `true` to enable https support, disabled by default. | | `SSL_SELF_SIGNED` | Set to `true` when using self signed ssl certificates. `false` by default. | | `SSL_CERTIFICATE_PATH` | Location of the ssl certificate. Defaults to `/home/git/data/certs/gitlab.crt` | @@ -878,6 +885,8 @@ Below is the complete list of available options that can be used to customize yo | `SSL_CA_CERTIFICATES_PATH` | List of SSL certificates to trust. Defaults to `/home/git/data/certs/ca.crt`. | | `SSL_REGISTRY_KEY_PATH` | Location of the ssl private key for gitlab container registry. Defaults to `/home/git/data/certs/registry.key` | | `SSL_REGISTRY_CERT_PATH` | Location of the ssl certificate for the gitlab container registry. Defaults to `/home/git/data/certs/registry.crt` | +| `SSL_PAGES_KEY_PATH` | Location of the ssl private key for gitlab pages. Defaults to `/home/git/data/certs/pages.key` | +| `SSL_PAGES_CERT_PATH` | Location of the ssl certificate for the gitlab pages. Defaults to `/home/git/data/certs/pages.crt` | | `SSL_CIPHERS` | List of supported SSL ciphers: Defaults to `ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4` | | `NGINX_WORKERS` | The number of nginx workers to start. Defaults to `1`. | | `NGINX_SERVER_NAMES_HASH_BUCKET_SIZE` | Sets the bucket size for the server names hash tables. This is needed when you have long server_names or your an error message from nginx like *nginx: [emerg] could not build server_names_hash, you should increase server_names_hash_bucket_size:..*. It should be only increment by a power of 2. Defaults to `32`. |