mirror of https://github.com/docker/docs.git
Fix docs URL not using https.
Fixes #13838. Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
This commit is contained in:
parent
883d661b69
commit
212dfb45de
|
@ -1,5 +1,5 @@
|
||||||
site_name: Docker Documentation
|
site_name: Docker Documentation
|
||||||
#site_url: http://docs.docker.com/
|
#site_url: https://docs.docker.com/
|
||||||
site_url: /
|
site_url: /
|
||||||
site_description: Documentation for fast and lightweight Docker container based virtualization framework.
|
site_description: Documentation for fast and lightweight Docker container based virtualization framework.
|
||||||
site_favicon: img/favicon.png
|
site_favicon: img/favicon.png
|
||||||
|
|
|
@ -258,7 +258,7 @@ API.
|
||||||
* *Yaml configuration file*: This file (`/usr/local/etc/dhe/storage.yml`) is
|
* *Yaml configuration file*: This file (`/usr/local/etc/dhe/storage.yml`) is
|
||||||
used to configure the image storage services. The editable text of the file is
|
used to configure the image storage services. The editable text of the file is
|
||||||
displayed in the dialog box. The schema of this file is identical to that used
|
displayed in the dialog box. The schema of this file is identical to that used
|
||||||
by the [Registry 2.0](http://docs.docker.com/registry/configuration/).
|
by the [Registry 2.0](https://docs.docker.com/registry/configuration/).
|
||||||
* If you are using the file system driver to provide local image storage, you will need to specify a root directory which will get mounted as a sub-path of
|
* If you are using the file system driver to provide local image storage, you will need to specify a root directory which will get mounted as a sub-path of
|
||||||
`/var/local/dhe/image-storage`. The default value of this root directory is
|
`/var/local/dhe/image-storage`. The default value of this root directory is
|
||||||
`/local`, so the full path to it is `/var/local/dhe/image-storage/local`.
|
`/local`, so the full path to it is `/var/local/dhe/image-storage/local`.
|
||||||
|
|
|
@ -45,7 +45,7 @@ You should be able to complete this guide in about thirty minutes.
|
||||||
> **Note:** This guide assumes you are familiar with basic Docker concepts such
|
> **Note:** This guide assumes you are familiar with basic Docker concepts such
|
||||||
> as images, containers, and registries. If you need to learn more about Docker
|
> as images, containers, and registries. If you need to learn more about Docker
|
||||||
> fundamentals, please consult the
|
> fundamentals, please consult the
|
||||||
> [Docker user guide](http://docs.docker.com/userguide/).
|
> [Docker user guide](https://docs.docker.com/userguide/).
|
||||||
|
|
||||||
First, you will retrieve a copy of the official Jenkins image from the Docker Hub. By default, if
|
First, you will retrieve a copy of the official Jenkins image from the Docker Hub. By default, if
|
||||||
Docker can't find an image locally, it will attempt to pull the image from the
|
Docker can't find an image locally, it will attempt to pull the image from the
|
||||||
|
|
|
@ -27,7 +27,7 @@ Automated Builds are supported for both public and private repositories
|
||||||
on both [GitHub](http://github.com) and [Bitbucket](https://bitbucket.org/).
|
on both [GitHub](http://github.com) and [Bitbucket](https://bitbucket.org/).
|
||||||
|
|
||||||
To use Automated Builds, you must have an [account on Docker Hub](
|
To use Automated Builds, you must have an [account on Docker Hub](
|
||||||
http://docs.docker.com/userguide/dockerhub/#creating-a-docker-hub-account)
|
https://docs.docker.com/userguide/dockerhub/#creating-a-docker-hub-account)
|
||||||
and on GitHub and/or Bitbucket. In either case, the account needs
|
and on GitHub and/or Bitbucket. In either case, the account needs
|
||||||
to be properly validated and activated before you can link to it.
|
to be properly validated and activated before you can link to it.
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# example Dockerfile for http://docs.docker.com/examples/postgresql_service/
|
# example Dockerfile for https://docs.docker.com/examples/postgresql_service/
|
||||||
#
|
#
|
||||||
|
|
||||||
FROM ubuntu
|
FROM ubuntu
|
||||||
|
|
|
@ -21,7 +21,7 @@ Start by creating a new `Dockerfile`:
|
||||||
> suitably secure.
|
> suitably secure.
|
||||||
|
|
||||||
#
|
#
|
||||||
# example Dockerfile for http://docs.docker.com/examples/postgresql_service/
|
# example Dockerfile for https://docs.docker.com/examples/postgresql_service/
|
||||||
#
|
#
|
||||||
|
|
||||||
FROM ubuntu
|
FROM ubuntu
|
||||||
|
|
|
@ -22,13 +22,13 @@ repository](https://github.com/docker/docker/blob/master/CHANGELOG.md).
|
||||||
|
|
||||||
| Feature | Description |
|
| Feature | Description |
|
||||||
|------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
|------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
|
||||||
| Container and Image Labels | Labels allow you to attach user-defined metadata to containers and images that can be used by your tools. For additional information on using labels, see [Apply custom metadata](http://docs.docker.com/userguide/labels-custom-metadata/#add-labels-to-images-the-label-instruction) in the documentation. |
|
| Container and Image Labels | Labels allow you to attach user-defined metadata to containers and images that can be used by your tools. For additional information on using labels, see [Apply custom metadata](https://docs.docker.com/userguide/labels-custom-metadata/#add-labels-to-images-the-label-instruction) in the documentation. |
|
||||||
| Windows Client preview | The Windows Client can be used just like the Mac OS X client is today with a remote host. Our testing infrastructure was scaled out to accommodate Windows Client testing on every PR to the Engine. See the Azure blog for [details on using this new client](http://azure.microsoft.com/blog/2015/04/16/docker-client-for-windows-is-now-available). |
|
| Windows Client preview | The Windows Client can be used just like the Mac OS X client is today with a remote host. Our testing infrastructure was scaled out to accommodate Windows Client testing on every PR to the Engine. See the Azure blog for [details on using this new client](http://azure.microsoft.com/blog/2015/04/16/docker-client-for-windows-is-now-available). |
|
||||||
| Logging drivers | The new logging driver follows the exec driver and storage driver concepts already available in Engine today. There is a new option `--log-driver` to `docker run` command. See the `run` reference for a [description on how to use this option](http://docs.docker.com/reference/run/#logging-drivers-log-driver). |
|
| Logging drivers | The new logging driver follows the exec driver and storage driver concepts already available in Engine today. There is a new option `--log-driver` to `docker run` command. See the `run` reference for a [description on how to use this option](https://docs.docker.com/reference/run/#logging-drivers-log-driver). |
|
||||||
| Image digests | When you pull, build, or run images, you specify them in the form `namespace/repository:tag`, or even just `repository`. In this release, you are now able to pull, run, build and refer to images by a new content addressable identifier called a “digest” with the syntax `namespace/repo@digest`. See the the command line reference for [examples of using the digest](http://docs.docker.com/reference/commandline/cli/#listing-image-digests). |
|
| Image digests | When you pull, build, or run images, you specify them in the form `namespace/repository:tag`, or even just `repository`. In this release, you are now able to pull, run, build and refer to images by a new content addressable identifier called a “digest” with the syntax `namespace/repo@digest`. See the the command line reference for [examples of using the digest](https://docs.docker.com/reference/commandline/cli/#listing-image-digests). |
|
||||||
| Custom cgroups | Containers are made from a combination of namespaces, capabilities, and cgroups. Docker already supports custom namespaces and capabilities. Additionally, in this release we’ve added support for custom cgroups. Using the `--cgroup-parent` flag, you can pass a specific `cgroup` to run a container in. See [the command line reference for more information](http://docs.docker.com/reference/commandline/cli/#create). |
|
| Custom cgroups | Containers are made from a combination of namespaces, capabilities, and cgroups. Docker already supports custom namespaces and capabilities. Additionally, in this release we’ve added support for custom cgroups. Using the `--cgroup-parent` flag, you can pass a specific `cgroup` to run a container in. See [the command line reference for more information](https://docs.docker.com/reference/commandline/cli/#create). |
|
||||||
| Ulimits | You can now specify the default `ulimit` settings for all containers when configuring the daemon. For example:`docker -d --default-ulimit nproc=1024:2048` See [Default Ulimits](http://docs.docker.com/reference/commandline/cli/#default-ulimits) in this documentation. |
|
| Ulimits | You can now specify the default `ulimit` settings for all containers when configuring the daemon. For example:`docker -d --default-ulimit nproc=1024:2048` See [Default Ulimits](https://docs.docker.com/reference/commandline/cli/#default-ulimits) in this documentation. |
|
||||||
| Commit and import Dockerfile | You can now make changes to images on the fly without having to re-build the entire image. The feature `commit --change` and `import --change` allows you to apply standard changes to a new image. These are expressed in the Dockerfile syntax and used to modify the image. For details on how to use these, see the [commit](http://docs.docker.com/reference/commandline/cli/#commit) and [import](http://docs.docker.com/reference/commandline/cli/#import). |
|
| Commit and import Dockerfile | You can now make changes to images on the fly without having to re-build the entire image. The feature `commit --change` and `import --change` allows you to apply standard changes to a new image. These are expressed in the Dockerfile syntax and used to modify the image. For details on how to use these, see the [commit](https://docs.docker.com/reference/commandline/cli/#commit) and [import](https://docs.docker.com/reference/commandline/cli/#import). |
|
||||||
|
|
||||||
### Known issues in Engine
|
### Known issues in Engine
|
||||||
|
|
||||||
|
@ -62,15 +62,15 @@ around a new set of distribution APIs
|
||||||
- **Webhook notifications**: You can now configure the Registry to send Webhooks
|
- **Webhook notifications**: You can now configure the Registry to send Webhooks
|
||||||
when images are pushed. Spin off a CI build, send a notification to IRC –
|
when images are pushed. Spin off a CI build, send a notification to IRC –
|
||||||
whatever you want! Included in the documentation is a detailed [notification
|
whatever you want! Included in the documentation is a detailed [notification
|
||||||
specification](http://docs.docker.com/registry/notifications/).
|
specification](https://docs.docker.com/registry/notifications/).
|
||||||
|
|
||||||
- **Native TLS support**: This release makes it easier to secure a registry with
|
- **Native TLS support**: This release makes it easier to secure a registry with
|
||||||
TLS. This documentation includes [expanded examples of secure
|
TLS. This documentation includes [expanded examples of secure
|
||||||
deployments](http://docs.docker.com/registry/deploying/).
|
deployments](https://docs.docker.com/registry/deploying/).
|
||||||
|
|
||||||
- **New Distribution APIs**: This release includes an expanded set of new
|
- **New Distribution APIs**: This release includes an expanded set of new
|
||||||
distribution APIs. You can read the [detailed specification
|
distribution APIs. You can read the [detailed specification
|
||||||
here](http://docs.docker.com/registry/spec/api/).
|
here](https://docs.docker.com/registry/spec/api/).
|
||||||
|
|
||||||
|
|
||||||
## Docker Compose 1.2
|
## Docker Compose 1.2
|
||||||
|
@ -86,7 +86,7 @@ with the keyword “extends”. With extends, you can refer to a service defined
|
||||||
elsewhere and include its configuration in a locally-defined service, while also
|
elsewhere and include its configuration in a locally-defined service, while also
|
||||||
adding or overriding configuration as necessary. The documentation describes
|
adding or overriding configuration as necessary. The documentation describes
|
||||||
[how to use extends in your
|
[how to use extends in your
|
||||||
configuration](http://docs.docker.com/compose/extends/#extending-services-in-
|
configuration](https://docs.docker.com/compose/extends/#extending-services-in-
|
||||||
compose).
|
compose).
|
||||||
|
|
||||||
- **Relative directory handling may cause breaking change**: Compose now treats
|
- **Relative directory handling may cause breaking change**: Compose now treats
|
||||||
|
@ -103,7 +103,7 @@ another directory.
|
||||||
|
|
||||||
You'll find the [release for download on
|
You'll find the [release for download on
|
||||||
GitHub](https://github.com/docker/swarm/releases/tag/v0.2.0) and [the
|
GitHub](https://github.com/docker/swarm/releases/tag/v0.2.0) and [the
|
||||||
documentation here](http://docs.docker.com/swarm/). This release includes the
|
documentation here](https://docs.docker.com/swarm/). This release includes the
|
||||||
following features:
|
following features:
|
||||||
|
|
||||||
- **Spread strategy**: A new strategy for scheduling containers on your cluster
|
- **Spread strategy**: A new strategy for scheduling containers on your cluster
|
||||||
|
@ -119,7 +119,7 @@ make it possible to use Swarm with clustering systems such as Mesos.
|
||||||
|
|
||||||
You'll find the [release for download on
|
You'll find the [release for download on
|
||||||
GitHub](https://github.com/docker/machine/releases) and [the documentation
|
GitHub](https://github.com/docker/machine/releases) and [the documentation
|
||||||
here](http://docs.docker.com/machine/). For a complete list of machine changes
|
here](https://docs.docker.com/machine/). For a complete list of machine changes
|
||||||
see [the changelog in the project
|
see [the changelog in the project
|
||||||
repository](https://github.com/docker/machine/blob/master/CHANGES.md#020-2015-03
|
repository](https://github.com/docker/machine/blob/master/CHANGES.md#020-2015-03
|
||||||
-22).
|
-22).
|
||||||
|
|
|
@ -94,7 +94,7 @@ community.
|
||||||
## Features of Docker Hub
|
## Features of Docker Hub
|
||||||
|
|
||||||
Let's take a closer look at some of the features of Docker Hub. You can find more
|
Let's take a closer look at some of the features of Docker Hub. You can find more
|
||||||
information [here](http://docs.docker.com/docker-hub/).
|
information [here](https://docs.docker.com/docker-hub/).
|
||||||
|
|
||||||
* Private repositories
|
* Private repositories
|
||||||
* Organizations and teams
|
* Organizations and teams
|
||||||
|
@ -163,7 +163,7 @@ a webhook you can specify a target URL and a JSON payload that will be
|
||||||
delivered when the image is pushed.
|
delivered when the image is pushed.
|
||||||
|
|
||||||
See the Docker Hub documentation for [more information on
|
See the Docker Hub documentation for [more information on
|
||||||
webhooks](http://docs.docker.com/docker-hub/repos/#webhooks)
|
webhooks](https://docs.docker.com/docker-hub/repos/#webhooks)
|
||||||
|
|
||||||
## Next steps
|
## Next steps
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,7 @@ Go to [Docker Swarm user guide](/swarm/).
|
||||||
* [Docker homepage](http://www.docker.com/)
|
* [Docker homepage](http://www.docker.com/)
|
||||||
* [Docker Hub](https://hub.docker.com)
|
* [Docker Hub](https://hub.docker.com)
|
||||||
* [Docker blog](http://blog.docker.com/)
|
* [Docker blog](http://blog.docker.com/)
|
||||||
* [Docker documentation](http://docs.docker.com/)
|
* [Docker documentation](https://docs.docker.com/)
|
||||||
* [Docker Getting Started Guide](http://www.docker.com/gettingstarted/)
|
* [Docker Getting Started Guide](http://www.docker.com/gettingstarted/)
|
||||||
* [Docker code on GitHub](https://github.com/docker/docker)
|
* [Docker code on GitHub](https://github.com/docker/docker)
|
||||||
* [Docker mailing
|
* [Docker mailing
|
||||||
|
|
Loading…
Reference in New Issue