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

Merge pull request #1196 from thaJeztah/bump_engine 

Update engine version to v19.03, optimise and add API v1.40
This commit is contained in:
Maria Bermudez 2019-06-13 19:06:27 +01:00 committed by GitHub
parent 9b7a83016e 2a6c73a6e2
commit 280fe33a45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 47 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -13,7 +13,7 @@
# Engine
ARG ENGINE_BRANCH="18.09.x"
ARG ENGINE_BRANCH="19.03.x"
# Distribution
ARG DISTRIBUTION_BRANCH="release/2.6"

8
_config.yml
View File

@ -19,9 +19,9 @@ exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.
# Component versions -- address like site.docker_ce_version
# You can't have - characters in these for non-YAML reasons
latest_engine_api_version: "1.39"
docker_ce_version: "18.09"
docker_ee_version: "18.09"
latest_engine_api_version: "1.40"
docker_ce_version: "19.03"
docker_ee_version: "19.03"
compose_version: "1.24.0"
compose_file_v3: "3.7"
compose_file_v2: "2.4"
@ -96,7 +96,7 @@ defaults:
- scope:
path: "install"
values:
win_latest_build: "docker-18.09.6"
win_latest_build: "docker-19.03.0"
- scope:
path: "datacenter"
values:

8
_config_authoring.yml
View File

@ -19,9 +19,9 @@ url: https://docs.docker.com
# TO USE ME:
# jekyll serve --incremental --config _config_authoring.yml
latest_engine_api_version: "1.39"
docker_ce_version: "18.09"
docker_ee_version: "18.09"
latest_engine_api_version: "1.40"
docker_ce_version: "19.03"
docker_ee_version: "19.03"
compose_version: "1.24.0"
compose_file_v3: "3.7"
compose_file_v2: "2.4"
@ -96,7 +96,7 @@ defaults:
- scope:
path: "install"
values:
win_latest_build: "docker-18.09.1"
win_latest_build: "docker-19.03.0"
- scope:
path: "datacenter"
values:

6
_data/toc.yaml
View File

@ -1124,6 +1124,12 @@ reference:
section:
- path: /engine/api/version-history/
title: Version history overview
- path: /engine/api/v1.40/
title: v1.40 reference
- path: /engine/api/v1.39/
title: v1.39 reference
- path: /engine/api/v1.38/
title: v1.38 reference
- path: /engine/api/v1.37/
title: v1.37 reference
- path: /engine/api/v1.36/

1
_includes/api-version-matrix.md
View File

@ -1,6 +1,7 @@
| Docker version | Maximum API version | Change log |
|:---------------|:---------------------------|:---------------------------------------------------------|
| 19.03 | [1.40](/engine/api/v1.40/) | [changes](/engine/api/version-history/#v140-api-changes) |
| 18.09 | [1.39](/engine/api/v1.39/) | [changes](/engine/api/version-history/#v139-api-changes) |
| 18.06 | [1.38](/engine/api/v1.38/) | [changes](/engine/api/version-history/#v138-api-changes) |
| 18.05 | [1.37](/engine/api/v1.37/) | [changes](/engine/api/version-history/#v137-api-changes) |

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

@ -50,8 +50,8 @@ done < <(cat ./_config.yml |grep '_version:' |grep '^[a-z].*')
sedi "s/{{ site.latest_engine_api_version }}/$latest_engine_api_version/g" ./_data/toc.yaml
# Engine stable
ENGINE_SVN_BRANCH="branches/18.09"
ENGINE_BRANCH="18.09"
ENGINE_SVN_BRANCH="branches/19.03"
ENGINE_BRANCH="19.03"
# Distribution
DISTRIBUTION_SVN_BRANCH="branches/release/2.6"
@ -83,6 +83,7 @@ wget --quiet --directory-prefix=./engine/api/v1.36/ https://raw.githubuserconten
wget --quiet --directory-prefix=./engine/api/v1.37/ https://raw.githubusercontent.com/docker/docker-ce/18.03/components/engine/api/swagger.yaml || (echo "Failed 1.37 swagger download" && exit 1)
wget --quiet --directory-prefix=./engine/api/v1.38/ https://raw.githubusercontent.com/docker/docker-ce/18.06/components/engine/api/swagger.yaml || (echo "Failed 1.38 swagger download" && exit 1)
wget --quiet --directory-prefix=./engine/api/v1.39/ https://raw.githubusercontent.com/docker/docker-ce/18.09/components/engine/api/swagger.yaml || (echo "Failed 1.39 swagger download" && exit 1)
wget --quiet --directory-prefix=./engine/api/v1.40/ https://raw.githubusercontent.com/docker/docker-ce/19.03/components/engine/api/swagger.yaml || (echo "Failed 1.40 swagger download" && exit 1)
# Get a few one-off files that we use directly from upstream

21
engine/api/v1.35/index.html
View File

@ -9,27 +9,10 @@ layout: null
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Reference for the API served by Docker Engine.">
<meta charset="utf-8"/>
<!--
ReDoc doesn't change outer page styles
-->
<style>
body {
margin: 0;
padding: 0;
}
api-logo {
background-image: linear-gradient(0deg, #15A4D7 0%, #1488C6 100%);
height: 100px;
text-align: left !important;
}
api-logo img {
width: 136px !important;
margin: 32px 0 0 50px;
}
</style>
<link rel="stylesheet" type="text/css" href="/css/api-reference.css">
</head>
<body>
<redoc spec-url="swagger.yaml" hide-hostname="true" suppress-warnings="true" lazy-rendering></redoc>
<script src="redoc.1.11.0.min.js"> </script>
<script src="/js/redoc.min.js"> </script>
</body>
</html>

44
engine/api/v1.35/redoc.1.11.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
engine/api/v1.36/index.html
View File

@ -9,27 +9,10 @@ layout: null
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Reference for the API served by Docker Engine.">
<meta charset="utf-8"/>
<!--
ReDoc doesn't change outer page styles
-->
<style>
body {
margin: 0;
padding: 0;
}
api-logo {
background-image: linear-gradient(0deg, #15A4D7 0%, #1488C6 100%);
height: 100px;
text-align: left !important;
}
api-logo img {
width: 136px !important;
margin: 32px 0 0 50px;
}
</style>
<link rel="stylesheet" type="text/css" href="/css/api-reference.css">
</head>
<body>
<redoc spec-url="swagger.yaml" hide-hostname="true" suppress-warnings="true" lazy-rendering></redoc>
<script src="redoc.1.11.0.min.js"> </script>
<script src="/js/redoc.min.js"> </script>
</body>
</html>

44
engine/api/v1.36/redoc.1.11.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
engine/api/v1.37/index.html
View File

@ -9,27 +9,10 @@ layout: null
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Reference for the API served by Docker Engine.">
<meta charset="utf-8"/>
<!--
ReDoc doesn't change outer page styles
-->
<style>
body {
margin: 0;
padding: 0;
}
api-logo {
background-image: linear-gradient(0deg, #15A4D7 0%, #1488C6 100%);
height: 100px;
text-align: left !important;
}
api-logo img {
width: 136px !important;
margin: 32px 0 0 50px;
}
</style>
<link rel="stylesheet" type="text/css" href="/css/api-reference.css">
</head>
<body>
<redoc spec-url="swagger.yaml" hide-hostname="true" suppress-warnings="true" lazy-rendering></redoc>
<script src="redoc.1.11.0.min.js"> </script>
<script src="/js/redoc.min.js"> </script>
</body>
</html>

44
engine/api/v1.37/redoc.1.11.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
engine/api/v1.38/index.html
View File

@ -9,27 +9,10 @@ layout: null
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Reference for the API served by Docker Engine.">
<meta charset="utf-8"/>
<!--
ReDoc doesn't change outer page styles
-->
<style>
body {
margin: 0;
padding: 0;
}
api-logo {
background-image: linear-gradient(0deg, #15A4D7 0%, #1488C6 100%);
height: 100px;
text-align: left !important;
}
api-logo img {
width: 136px !important;
margin: 32px 0 0 50px;
}
</style>
<link rel="stylesheet" type="text/css" href="/css/api-reference.css">
</head>
<body>
<redoc spec-url="swagger.yaml" hide-hostname="true" suppress-warnings="true" lazy-rendering></redoc>
<script src="redoc.1.11.0.min.js"> </script>
<script src="/js/redoc.min.js"> </script>
</body>
</html>

44
engine/api/v1.38/redoc.1.11.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
engine/api/v1.39/index.html
View File

@ -9,27 +9,10 @@ layout: null
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Reference for the API served by Docker Engine.">
<meta charset="utf-8"/>
<!--
ReDoc doesn't change outer page styles
-->
<style>
body {
margin: 0;
padding: 0;
}
api-logo {
background-image: linear-gradient(0deg, #15A4D7 0%, #1488C6 100%);
height: 100px;
text-align: left !important;
}
api-logo img {
width: 136px !important;
margin: 32px 0 0 50px;
}
</style>
<link rel="stylesheet" type="text/css" href="/css/api-reference.css">
</head>
<body>
<redoc spec-url="swagger.yaml" hide-hostname="true" suppress-warnings="true" lazy-rendering></redoc>
<script src="redoc.1.11.0.min.js"> </script>
<script src="/js/redoc.min.js"> </script>
</body>
</html>

44
engine/api/v1.39/redoc.1.11.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
engine/api/v1.40/index.html Normal file
View File

@ -0,0 +1,18 @@
---
layout: null
---
<!DOCTYPE html>
<html>
<head>
<title>Docker Engine API v1.40 Reference</title>
<!-- needed for adaptive design -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Reference for the API served by Docker Engine.">
<meta charset="utf-8"/>
<link rel="stylesheet" type="text/css" href="/css/api-reference.css">
</head>
<body>
<redoc spec-url="swagger.yaml" hide-hostname="true" suppress-warnings="true" lazy-rendering></redoc>
<script src="/js/redoc.min.js"> </script>
</body>
</html>