docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename / remove edge-related variables 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-01-11 12:40:04 +01:00
parent b35c8756aa
commit aae9bfc276
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
12 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_config.yml
View File

@ -16,12 +16,11 @@ url: https://docs.docker.com
keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13", "v17.03", "v17.06", "v17.09", "v17.12", "v18.03"] keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13", "v17.03", "v17.06", "v17.09", "v17.12", "v18.03"]
exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks"] exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks"]
# Component versions -- address like site.docker_ce_stable_version # Component versions -- address like site.docker_ce_version
# You can't have - characters in these for non-YAML reasons # You can't have - characters in these for non-YAML reasons
latest_stable_docker_engine_api_version: "1.39" latest_engine_api_version: "1.39"
docker_ce_stable_version: "18.09" docker_ce_version: "18.09"
docker_ce_edge_version: "18.09"
docker_ee_version: "18.09" docker_ee_version: "18.09"
compose_version: "1.23.2" compose_version: "1.23.2"
machine_version: "0.16.0" machine_version: "0.16.0"

7
_config_authoring.yml
View File

@ -12,15 +12,14 @@ lsi: false
url: https://docs.docker.com url: https://docs.docker.com
incremental: false incremental: false
# Component versions -- address like site.docker_ce_stable_version # Component versions -- address like site.docker_ce_version
# You can't have - characters in these for non-YAML reasons # You can't have - characters in these for non-YAML reasons
# TO USE ME: # TO USE ME:
# jekyll serve --incremental --config _config_authoring.yml # jekyll serve --incremental --config _config_authoring.yml
docker_ce_stable_version: "17.09" latest_engine_api_version: "1.32"
latest_stable_docker_engine_api_version: "1.32" docker_ce_version: "17.09"
docker_ce_edge_version: "17.09"
docker_ee_version: "17.06" docker_ee_version: "17.06"
compose_version: "1.16.1" compose_version: "1.16.1"
machine_version: "0.12.2" machine_version: "0.12.2"

2
_data/toc.yaml
View File

@ -970,7 +970,7 @@ reference:
- path: /engine/api/sdks/ - path: /engine/api/sdks/
title: SDKs title: SDKs
- path: /engine/api/latest/ - path: /engine/api/latest/
title: v{{ site.latest_stable_docker_engine_api_version }} reference (latest stable) title: v{{ site.latest_engine_api_version }} reference (latest)
- sectiontitle: API reference by version - sectiontitle: API reference by version
section: section:
- path: /engine/api/version-history/ - path: /engine/api/version-history/

4
_layouts/docs.html
View File

@ -106,7 +106,7 @@
// Default to assuming this is an archive and hiding some stuff // Default to assuming this is an archive and hiding some stuff
// See js/archive.js and js/docs.js for logic relating to this // See js/archive.js and js/docs.js for logic relating to this
var isArchive = true; var isArchive = true;
var dockerVersion = 'v{{ site.docker_ce_stable_version }}'; var dockerVersion = 'v{{ site.docker_ce_version }}';
</script> </script>
</head> </head>
<body ng-app="Docker" ng-controller="DockerController" class="colums"> <body ng-app="Docker" ng-controller="DockerController" class="colums">
@ -303,7 +303,7 @@
// Default to assuming this is an archive and hiding some stuff // Default to assuming this is an archive and hiding some stuff
// See js/archive.js and js/docs.js for logic relating to this // See js/archive.js and js/docs.js for logic relating to this
var isArchive = true; var isArchive = true;
var dockerVersion = 'v{{ site.docker_ce_stable_version }}'; var dockerVersion = 'v{{ site.docker_ce_version }}';
// In archives, we need to know the page root and we get it from JEKYLL_ENV in the jekyll build command // In archives, we need to know the page root and we get it from JEKYLL_ENV in the jekyll build command
var jekyllEnv = '{{ jekyll.environment }}'; var jekyllEnv = '{{ jekyll.environment }}';
// If unset (in non-archive branches), defaults to "development". In that case, reset it to empty // If unset (in non-archive branches), defaults to "development". In that case, reset it to empty

2
_scripts/fetch-upstream-resources.sh
View File

@ -64,7 +64,7 @@ while read i; do
done < <(cat ${SOURCE}/_config.yml |grep '_version:' |grep '^[a-z].*') done < <(cat ${SOURCE}/_config.yml |grep '_version:' |grep '^[a-z].*')
# Replace variable in toc.yml with value from above # Replace variable in toc.yml with value from above
sedi "s/{{ site.latest_stable_docker_engine_api_version }}/$latest_stable_docker_engine_api_version/g" ${SOURCE}/_data/toc.yaml sedi "s/{{ site.latest_engine_api_version }}/$latest_engine_api_version/g" ${SOURCE}/_data/toc.yaml
# Engine stable # Engine stable
ENGINE_SVN_BRANCH="branches/18.09" ENGINE_SVN_BRANCH="branches/18.09"

2
docker-for-mac/index.md
View File

@ -29,7 +29,7 @@ running different versions.
```shell ```shell
$ docker --version $ docker --version
Docker version {{ site.docker_ce_stable_version }}, build c97c6d6 Docker version {{ site.docker_ce_version }}, build c97c6d6
$ docker-compose --version $ docker-compose --version
docker-compose version {{ site.compose_version }}, build 8dd22a9 docker-compose version {{ site.compose_version }}, build 8dd22a9

2
edge/index.md
View File

@ -6,7 +6,7 @@ keywords: engine, edge, installation
> **The Docker CE Edge channel is deprecated in favor of nightly channel. See [About Docker CE](/install/index.md) for details on how to access the nightly channel.** > **The Docker CE Edge channel is deprecated in favor of nightly channel. See [About Docker CE](/install/index.md) for details on how to access the nightly channel.**
The latest Docker CE Stable release is **[{{ site.docker_ce_stable_version }}](/engine/release-notes/)**. The latest Docker CE Stable release is **[{{ site.docker_ce_version }}](/engine/release-notes/)**.
Stable releases are not published to the Edge channel, so Linux repository users Stable releases are not published to the Edge channel, so Linux repository users
should subscribe to the Stable channels. should subscribe to the Stable channels.

2
engine/api/latest/index.html
View File

@ -1,6 +1,6 @@
--- ---
--- ---
<html> <html>
<head><meta http-equiv="refresh" content="0;url=/engine/api/v{{ site.latest_stable_docker_engine_api_version }}/" /></head> <head><meta http-equiv="refresh" content="0;url=/engine/api/v{{ site.latest_engine_api_version }}/" /></head>
<body><p>Redirecting to the latest version of the Docker Engine API reference.</body> <body><p>Redirecting to the latest version of the Docker Engine API reference.</body>
</html> </html>

2
install/linux/docker-ce/centos.md
View File

@ -160,7 +160,7 @@ from the repository.
```bash ```bash
$ yum list docker-ce --showduplicates | sort -r $ yum list docker-ce --showduplicates | sort -r
docker-ce.x86_64 {{ site.docker_ce_stable_version }}.0.ce-1.el7.centos docker-ce-stable docker-ce.x86_64 {{ site.docker_ce_version }}.0.ce-1.el7.centos docker-ce-stable
``` ```
The list returned depends on which repositories are enabled, and is specific The list returned depends on which repositories are enabled, and is specific

2
install/linux/docker-ce/fedora.md
View File

@ -149,7 +149,7 @@ from the repository.
```bash ```bash
$ dnf list docker-ce --showduplicates | sort -r $ dnf list docker-ce --showduplicates | sort -r
docker-ce.x86_64 {{ site.docker_ce_stable_version }}.0.fc26 docker-ce-stable docker-ce.x86_64 {{ site.docker_ce_version }}.0.fc26 docker-ce-stable
``` ```
The list returned depends on which repositories are enabled, and is specific The list returned depends on which repositories are enabled, and is specific

2
storage/storagedriver/select-storage-driver.md
View File

@ -50,7 +50,7 @@ Docker supports the following storage drivers:
driver is poor, and is not generally recommended for production use. driver is poor, and is not generally recommended for production use.
Docker's source code defines the selection order. You can see the order at Docker's source code defines the selection order. You can see the order at
[the source code for Docker Engine - Community {{ site.docker_ce_stable_version }}](https://github.com/docker/docker-ce/blob/{{ site.docker_ce_stable_version }}/components/engine/daemon/graphdriver/driver_linux.go#L50) [the source code for Docker Engine - Community {{ site.docker_ce_version }}](https://github.com/docker/docker-ce/blob/{{ site.docker_ce_version }}/components/engine/daemon/graphdriver/driver_linux.go#L50)
If you run a different version of Docker, you can use the branch selector at the top of the file viewer to choose a different branch. If you run a different version of Docker, you can use the branch selector at the top of the file viewer to choose a different branch.
{: id="storage-driver-order" } {: id="storage-driver-order" }

8
test.md
View File

@ -268,14 +268,14 @@ example, [swarm](glossary.md?term=swarm)).
## Site-wide variables ## Site-wide variables
Look in the top-level `_config.yml` for site-wide variables, such as Look in the top-level `_config.yml` for site-wide variables, such as
`site.docker_ce_stable_version`. To use them, use Liquid like: `site.docker_ce_version`. To use them, use Liquid like:
```liquid ```liquid
{% raw %}{{ site.docker_ce_stable_version }}{% endraw %} {% raw %}{{ site.docker_ce_version }}{% endraw %}
``` ```
The current value of `site.docker_ce_stable_version` is The current value of `site.docker_ce_version` is
{{ site.docker_ce_stable_version }}. {{ site.docker_ce_version }}.
## Mixing Markdown and HTML ## Mixing Markdown and HTML