Skip to content

Commit

Permalink
3.0 release configs (docker#9086)
Browse files Browse the repository at this point in the history
edit configs for 3.0 release
  • Loading branch information
allysmith424 authored and usha-mandya committed Jul 22, 2019
1 parent 903cc2e commit 736d2c7
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 15 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@


# Engine
ARG ENGINE_BRANCH="18.09.x"
ARG ENGINE_BRANCH="19.03.x"

# Distribution
ARG DISTRIBUTION_BRANCH="release/2.6"
ARG DISTRIBUTION_BRANCH="release/2.7"


###
Expand Down Expand Up @@ -62,6 +62,7 @@ COPY --from=docs/docker.github.io:v17.06 ${TARGET} ${TARGET}
COPY --from=docs/docker.github.io:v17.09 ${TARGET} ${TARGET}
COPY --from=docs/docker.github.io:v17.12 ${TARGET} ${TARGET}
COPY --from=docs/docker.github.io:v18.03 ${TARGET} ${TARGET}
COPY --from=docs/docker.github.io:v18.09 ${TARGET} ${TARGET}

# Fetch library samples (documentation from official images on Docker Hub)
# Only add the files that are needed to build these reference docs, so that
Expand Down
52 changes: 40 additions & 12 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,29 @@ safe: false
lsi: false
url: https://docs.docker.com
# This needs to have all the directories you expect to be in the archives (delivered by docs-base in the Dockerfile)
keep_files: ["v17.03", "v17.06", "v17.09", "v17.12", "v18.03"]
keep_files: ["v17.03", "v17.06", "v17.09", "v17.12", "v18.03", "v18.09"]
exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.html"]

# 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"
compose_version: "1.24.1"
latest_engine_api_version: "1.40"
docker_ce_version: "19.03"
docker_ee_version: "19.03"
compose_version: "1.25.0"
compose_file_v3: "3.7"
compose_file_v2: "2.4"
machine_version: "0.16.0"
distribution_version: "2.6"
dtr_version: "2.6"
ucp_version: "3.1"
distribution_version: "2.7"
dtr_version: "2.7"
ucp_version: "3.2"

ucp_versions:
- version: "3.1"
- version: "3.2"
path: /ee/ucp/
latest: true
- version: "3.1"
path: /datacenter/ucp/3.1/guides/
- version: "3.0"
path: /datacenter/ucp/3.0/guides/
- version: "2.2"
Expand All @@ -46,9 +48,11 @@ ucp_versions:
path: /datacenter/ucp/1.1/overview/

dtr_versions:
- version: "2.6"
- version: "2.7"
path: /ee/dtr/
latest: true
- version: "2.6"
path: /datacenter/dtr/2.6/guides/
- version: "2.5"
path: /datacenter/dtr/2.5/guides/
- version: "2.4"
Expand All @@ -63,11 +67,21 @@ dtr_versions:
path: /datacenter/dtr/2.0/

tablabels:
dee-3.0: Docker Enterprise Edition 3.0
dee-2.1: Docker Enterprise Edition 2.1
dee-2.0: Docker Enterprise Edition 2.0
ucp-3.2: Universal Control Plane 3.2
ucp-3.1: Universal Control Plane 3.1
ucp-3.0: Universal Control Plane 3.0
ucp-2.2: Universal Control Plane 2.2
dtr-2.7: Docker Trusted Registry 2.7
dtr-2.6: Docker Trusted Registry 2.6
dtr-2.5: Docker Trusted Registry 2.5
dtr-2.4: Docker Trusted Registry 2.4
engine-19.03: Docker EE Engine 19.03
engine-18.09: Docker EE Engine 18.09
engine-18.03: Docker EE Engine 18.03
engine-17.12: Docker EE Engine 17.12
engine-17.06: Docker EE Engine 17.06
engine-17.03: Docker EE Engine 17.03
docker-cli-linux: Docker CLI on Mac/Linux
Expand Down Expand Up @@ -96,14 +110,21 @@ defaults:
- scope:
path: "install"
values:
win_latest_build: "docker-18.09.8"
win_latest_build: "docker-19.03.0"
- scope:
path: "datacenter"
values:
enterprise: true
- scope:
path: "ee/dtr"
values:
dtr_org: "docker"
dtr_repo: "dtr"
dtr_version: "2.7.0"
- scope:
path: "datacenter/dtr/2.6"
values:
hide_from_sitemap: true
dtr_org: "docker"
dtr_repo: "dtr"
dtr_version: "2.6.8"
Expand Down Expand Up @@ -156,8 +177,15 @@ defaults:
ucp_org: "docker"
ucp_repo: "ucp"
dtr_repo: "dtr"
ucp_version: "3.2.0"
dtr_version: "2.7.0"
- scope:
path: "datacenter/ucp/3.1"
values:
hide_from_sitemap: true
ucp_org: "docker"
ucp_repo: "ucp"
ucp_version: "3.1.9"
dtr_version: "2.6.8"
- scope:
path: "datacenter/ucp/3.0"
values:
Expand Down
5 changes: 4 additions & 1 deletion _data/docsarchive/archives.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
- archive:
name: v18.09
name: v19.03
image: docs/docker.github.io:latest
current: true
# When you make a new stable archive version, move the edge one to be second in
# the list. The image for edge should be the same as latest.
- archive:
name: edge
image: docs/docker.github.io:latest
- archive:
name: v18.09
image: docs/docker.github.io:v18.09
- archive:
name: v18.03
image: docs/docker.github.io:v18.03
Expand Down
3 changes: 3 additions & 0 deletions robots.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Disallow: /v1.13/
Disallow: /v17.03/
Disallow: /v17.06/
Disallow: /v18.03/
Disallow: /v18.09/

# Docker Datacenter archives
Disallow: /datacenter/dtr/2.0
Expand All @@ -22,7 +23,9 @@ Disallow: /datacenter/dtr/2.2
Disallow: /datacenter/dtr/2.3
Disallow: /datacenter/dtr/2.4
Disallow: /datacenter/dtr/2.5
Disallow: /datacenter/dtr/2.6

Disallow: /datacenter/ucp/3.1
Disallow: /datacenter/ucp/3.0
Disallow: /datacenter/ucp/2.1
Disallow: /datacenter/ucp/2.0
Expand Down

0 comments on commit 736d2c7

Please sign in to comment.