From 22f660cf3b593cd66b2ebf0e9273d319b65d2638 Mon Sep 17 00:00:00 2001 From: Paul Gottschling Date: Wed, 9 Feb 2022 16:18:47 -0400 Subject: [PATCH] Update Docker image tags in docs (#9402) Some docs pages related to our Docker images use the (= version =) variable to populate image tags. However, this variable uses a different format for version numbers than our image repositories, meaning that users attempting to pull images mentioned in these docs see an error message. This change uses the teleport.latest_(oss|ent)_docker_image variable instead. Closes #7871 --- docs/pages/enterprise/getting-started.mdx | 4 ++-- docs/pages/includes/image.mdx | 2 +- docs/pages/installation.mdx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/pages/enterprise/getting-started.mdx b/docs/pages/enterprise/getting-started.mdx index 581b3f40330aa..bb2f6d60c49c5 100644 --- a/docs/pages/enterprise/getting-started.mdx +++ b/docs/pages/enterprise/getting-started.mdx @@ -374,8 +374,8 @@ They are stable, and we recommend their use to easily keep your Teleport Enterpr | Image name | Open Source or Enterprise? | Teleport version | Image automatically updated? | Image base | | - | - | - | - | - | -| `quay.io/gravitational/teleport-ent:(=version=)` | Enterprise | The latest version of Teleport Enterprise (=version=) | Yes | [Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) | -| `quay.io/gravitational/teleport-ent:(=version=)-fips` | Enterprise FIPS | The latest version of Teleport Enterprise (=version=) FIPS | Yes | [Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) | +| `(=teleport.latest_ent_docker_image=)` | Enterprise | The latest version of Teleport Enterprise (=version=) | Yes | [Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) | +| `(=teleport.latest_ent_docker_image=)-fips` | Enterprise FIPS | The latest version of Teleport Enterprise (=version=) FIPS | Yes | [Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) | | `quay.io/gravitational/teleport-ent:(=teleport.version=)` | Enterprise | The version specified in the image's tag (i.e. (=teleport.version=)) | No | [Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) | | `quay.io/gravitational/teleport-ent:(=teleport.version=)-fips` | Enterprise FIPS | The version specified in the image's tag (i.e. (=teleport.version=)) | No | [Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) | diff --git a/docs/pages/includes/image.mdx b/docs/pages/includes/image.mdx index 1a9384929892e..128246e773d86 100644 --- a/docs/pages/includes/image.mdx +++ b/docs/pages/includes/image.mdx @@ -17,7 +17,7 @@ keep your Teleport installation up to date. Image nameTeleport versionImage automatically updated?Image base - `quay.io/gravitational/teleport:(=version=)`The latest version of Teleport Open Source (=version=)Yes[Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) + `(=teleport.latest_oss_docker_image=)`The latest version of Teleport Open Source (=version=)Yes[Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) `quay.io/gravitational/teleport:(=teleport.version=)`The version specified in the image's tag (i.e. (=teleport.version=))No[Ubuntu 20.04](https://hub.docker.com/\_/ubuntu) diff --git a/docs/pages/installation.mdx b/docs/pages/installation.mdx index d440d4ba46b6a..120897f765ff5 100644 --- a/docs/pages/installation.mdx +++ b/docs/pages/installation.mdx @@ -81,7 +81,7 @@ up-to-date information. Please follow our [Getting started with Teleport using Docker](./setup/guides/docker.mdx) or with [Teleport Enterprise using Docker](enterprise/getting-started.mdx#run-teleport-enterprise-using-docker) for install and setup instructions. ```code -$ docker pull quay.io/gravitational/teleport:(=teleport.version=) +$ docker pull (=teleport.latest_oss_docker_image=) ``` ## Helm