From aae9bfc2768c757b51b15e6293cb65a2b790dd7f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 11 Jan 2019 12:40:04 +0100 Subject: [PATCH] Rename / remove edge-related variables Signed-off-by: Sebastiaan van Stijn --- _config.yml | 7 +++---- _config_authoring.yml | 7 +++---- _data/toc.yaml | 2 +- _layouts/docs.html | 4 ++-- _scripts/fetch-upstream-resources.sh | 2 +- docker-for-mac/index.md | 2 +- edge/index.md | 2 +- engine/api/latest/index.html | 2 +- install/linux/docker-ce/centos.md | 2 +- install/linux/docker-ce/fedora.md | 2 +- storage/storagedriver/select-storage-driver.md | 2 +- test.md | 8 ++++---- 12 files changed, 20 insertions(+), 22 deletions(-) diff --git a/_config.yml b/_config.yml index 1e85bce456..bc9ed6a723 100644 --- a/_config.yml +++ b/_config.yml @@ -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"] 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 -latest_stable_docker_engine_api_version: "1.39" -docker_ce_stable_version: "18.09" -docker_ce_edge_version: "18.09" +latest_engine_api_version: "1.39" +docker_ce_version: "18.09" docker_ee_version: "18.09" compose_version: "1.23.2" machine_version: "0.16.0" diff --git a/_config_authoring.yml b/_config_authoring.yml index 921585729a..1bc8186752 100644 --- a/_config_authoring.yml +++ b/_config_authoring.yml @@ -12,15 +12,14 @@ lsi: false url: https://docs.docker.com 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 # TO USE ME: # jekyll serve --incremental --config _config_authoring.yml -docker_ce_stable_version: "17.09" -latest_stable_docker_engine_api_version: "1.32" -docker_ce_edge_version: "17.09" +latest_engine_api_version: "1.32" +docker_ce_version: "17.09" docker_ee_version: "17.06" compose_version: "1.16.1" machine_version: "0.12.2" diff --git a/_data/toc.yaml b/_data/toc.yaml index 7878ed98a6..b2f7a5024c 100644 --- a/_data/toc.yaml +++ b/_data/toc.yaml @@ -970,7 +970,7 @@ reference: - path: /engine/api/sdks/ title: SDKs - 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 section: - path: /engine/api/version-history/ diff --git a/_layouts/docs.html b/_layouts/docs.html index 04eecae589..7887877453 100644 --- a/_layouts/docs.html +++ b/_layouts/docs.html @@ -106,7 +106,7 @@ // Default to assuming this is an archive and hiding some stuff // See js/archive.js and js/docs.js for logic relating to this var isArchive = true; - var dockerVersion = 'v{{ site.docker_ce_stable_version }}'; + var dockerVersion = 'v{{ site.docker_ce_version }}'; @@ -303,7 +303,7 @@ // Default to assuming this is an archive and hiding some stuff // See js/archive.js and js/docs.js for logic relating to this 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 var jekyllEnv = '{{ jekyll.environment }}'; // If unset (in non-archive branches), defaults to "development". In that case, reset it to empty diff --git a/_scripts/fetch-upstream-resources.sh b/_scripts/fetch-upstream-resources.sh index e46386814c..3058266fc5 100755 --- a/_scripts/fetch-upstream-resources.sh +++ b/_scripts/fetch-upstream-resources.sh @@ -64,7 +64,7 @@ while read i; do done < <(cat ${SOURCE}/_config.yml |grep '_version:' |grep '^[a-z].*') # 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_SVN_BRANCH="branches/18.09" diff --git a/docker-for-mac/index.md b/docker-for-mac/index.md index 14a2d0f024..7d4dcde633 100644 --- a/docker-for-mac/index.md +++ b/docker-for-mac/index.md @@ -29,7 +29,7 @@ running different versions. ```shell $ 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 {{ site.compose_version }}, build 8dd22a9 diff --git a/edge/index.md b/edge/index.md index 73cbf1103a..96ab25db9e 100644 --- a/edge/index.md +++ b/edge/index.md @@ -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 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 should subscribe to the Stable channels. diff --git a/engine/api/latest/index.html b/engine/api/latest/index.html index 408ac7a573..c3db336aee 100644 --- a/engine/api/latest/index.html +++ b/engine/api/latest/index.html @@ -1,6 +1,6 @@ --- --- - +

Redirecting to the latest version of the Docker Engine API reference. \ No newline at end of file diff --git a/install/linux/docker-ce/centos.md b/install/linux/docker-ce/centos.md index aacf1d203f..4faf319902 100644 --- a/install/linux/docker-ce/centos.md +++ b/install/linux/docker-ce/centos.md @@ -160,7 +160,7 @@ from the repository. ```bash $ 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 diff --git a/install/linux/docker-ce/fedora.md b/install/linux/docker-ce/fedora.md index b8da3b32f9..ff25e52277 100644 --- a/install/linux/docker-ce/fedora.md +++ b/install/linux/docker-ce/fedora.md @@ -149,7 +149,7 @@ from the repository. ```bash $ 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 diff --git a/storage/storagedriver/select-storage-driver.md b/storage/storagedriver/select-storage-driver.md index f488b2a736..b6ddf9ceb3 100644 --- a/storage/storagedriver/select-storage-driver.md +++ b/storage/storagedriver/select-storage-driver.md @@ -50,7 +50,7 @@ Docker supports the following storage drivers: 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 -[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. {: id="storage-driver-order" } diff --git a/test.md b/test.md index 846b4c4b69..5b04db1254 100644 --- a/test.md +++ b/test.md @@ -268,14 +268,14 @@ example, [swarm](glossary.md?term=swarm)). ## Site-wide variables 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 -{% raw %}{{ site.docker_ce_stable_version }}{% endraw %} +{% raw %}{{ site.docker_ce_version }}{% endraw %} ``` -The current value of `site.docker_ce_stable_version` is -{{ site.docker_ce_stable_version }}. +The current value of `site.docker_ce_version` is +{{ site.docker_ce_version }}. ## Mixing Markdown and HTML