Skip to content

Commit

Permalink
Reduce list of archives to supported enterprise versions
Browse files Browse the repository at this point in the history
Docker Enterprise actively supports the 17.06, 18.03, 18.09, and
19.03 versions, with 17.06 and 18.03 reaching EOL soon.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Feb 25, 2020
1 parent 12592a9 commit c78b3be
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 18 deletions.
3 changes: 0 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,7 @@ FROM scratch AS archives-true
ENV TARGET=/usr/share/nginx/html
# To add a new archive, add it here and ALSO edit _data/docsarchive/archives.yaml
# to add it to the drop-down
COPY --from=docs/docker.github.io:v17.03 ${TARGET} /
COPY --from=docs/docker.github.io:v17.06 ${TARGET} /
COPY --from=docs/docker.github.io:v17.09 ${TARGET} /
COPY --from=docs/docker.github.io:v17.12 ${TARGET} /
COPY --from=docs/docker.github.io:v18.03 ${TARGET} /
COPY --from=docs/docker.github.io:v18.09 ${TARGET} /

Expand Down
5 changes: 1 addition & 4 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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", "v18.09"]
keep_files: ["v17.06", "v18.03", "v18.09"]
exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.html"]

# Component versions -- address like site.docker_ce_version
Expand Down Expand Up @@ -81,10 +81,7 @@ tablabels:
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.09: Docker EE Engine 17.09
engine-17.06: Docker EE Engine 17.06
engine-17.03: Docker EE Engine 17.03
docker-cli-linux: Docker CLI on Mac/Linux
docker-cli-win: Docker CLI on Windows
kubectl: Kubernetes CLI
Expand Down
3 changes: 1 addition & 2 deletions _config_authoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ 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", "v18.09"]
keep_files: ["v17.06", "v18.03", "v18.09"]
exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.html"]

# Component versions -- address like site.docker_ce_version
Expand Down Expand Up @@ -85,7 +85,6 @@ tablabels:
engine-18.09: Docker EE Engine 18.09
engine-18.03: Docker EE Engine 18.03
engine-17.06: Docker EE Engine 17.06
engine-17.03: Docker EE Engine 17.03
docker-cli-linux: Docker CLI on Mac/Linux
docker-cli-win: Docker CLI on Windows
kubectl: Kubernetes CLI
Expand Down
9 changes: 0 additions & 9 deletions _data/docsarchive/archives.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@
- archive:
name: v18.03
image: docs/docker.github.io:v18.03
- archive:
name: v17.12
image: docs/docker.github.io:v17.12
- archive:
name: v17.09
image: docs/docker.github.io:v17.09
- archive:
name: v17.06
image: docs/docker.github.io:v17.06
- archive:
name: v17.03
image: docs/docker.github.io:v17.03

0 comments on commit c78b3be

Please sign in to comment.