Skip to content

Commit

Permalink
Replace quay.io with amazon ECR where appropriate (gravitational#15382)
Browse files Browse the repository at this point in the history
  • Loading branch information
logand22 authored Aug 19, 2022
1 parent c2c0d6a commit 830794a
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .cloudbuild/ci/doc-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- name: quay.io/gravitational/docs:latest
- name: public.ecr.aws/gravitational/docs:latest
id: docs-test
entrypoint: /bin/bash
dir: /src
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,9 @@ In a production environment, Teleport must run as `root`. For testing or non-pro
If you wish to deploy Teleport inside a Docker container:
```
# This command will pull the Teleport container image for version 8
docker pull quay.io/gravitational/teleport:8
docker pull public.ecr.aws/gravitational/teleport:8
```
View latest tags on [Quay.io | gravitational/teleport](https://quay.io/repository/gravitational/teleport?tab=tags)
View latest tags on [Amazon ECR Public | gravitational/teleport](https://gallery.ecr.aws/gravitational/teleport)

### For Local Testing and Development

Expand Down
2 changes: 1 addition & 1 deletion assets/loadtest/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SOAK_TEST_DURATION ?= 30m
USE_CERT_MANAGER ?= yes
TELEPORT_IMAGE ?= quay.io/gravitational/teleport-ent:10.0.0
TELEPORT_IMAGE ?= public.ecr.aws/gravitational/teleport-ent:10.0.0
NAMESPACE ?= loadtest

.PHONY: reserve-ips
Expand Down
2 changes: 1 addition & 1 deletion assets/loadtest/k8s/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CERT_MANAGER_VERSION ?= v1.7.1
SOAK_TEST_DURATION ?= 30m
BACKEND ?= etcd
USE_CERT_MANAGER ?= yes
TELEPORT_IMAGE ?= quay.io/gravitational/teleport-ent:10.0.0
TELEPORT_IMAGE ?= public.ecr.aws/gravitational/teleport-ent:10.0.0
NAMESPACE ?= loadtest
NODE ?=

Expand Down
2 changes: 1 addition & 1 deletion build.assets/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ BUILDBOX_TELETERM=public.ecr.aws/gravitational/teleport-buildbox-teleterm:$(BUIL
BUILDBOX_NAME=$(BUILDBOX)
BUILDBOX_FIPS_NAME=$(BUILDBOX_FIPS)

DOCSBOX=quay.io/gravitational/next:main
DOCSBOX=public.ecr.aws/gravitational/docs

ifneq ("$(KUBECONFIG)","")
DOCKERFLAGS := $(DOCKERFLAGS) -v $(KUBECONFIG):/mnt/kube/config -e KUBECONFIG=/mnt/kube/config -e TEST_KUBE=$(TEST_KUBE)
Expand Down
2 changes: 1 addition & 1 deletion docker/sshd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG TELEPORT_TAG
FROM quay.io/gravitational/teleport:${TELEPORT_TAG}
FROM public.ecr.aws/gravitational/teleport:${TELEPORT_TAG}

# Demo ansible, ssh, htop
RUN apt-get update && apt-get install -y ansible ssh inetutils-syslogd htop
Expand Down
4 changes: 2 additions & 2 deletions docker/teleport-ent-quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
# The configure container starts, generates a config, writes it to
# /etc/teleport/teleport.yaml and then immediately exits.
configure:
image: quay.io/gravitational/teleport-ent:10
image: public.ecr.aws/gravitational/teleport-ent:10
container_name: teleport-configure
entrypoint: /bin/sh
hostname: localhost
Expand All @@ -14,7 +14,7 @@ services:
# This container depends on the config written by the configure container above, so it
# sleeps for a second on startup to allow the configure container to run first.
teleport:
image: quay.io/gravitational/teleport-ent:10
image: public.ecr.aws/gravitational/teleport-ent:10
container_name: teleport
entrypoint: /bin/sh
hostname: localhost
Expand Down
8 changes: 4 additions & 4 deletions docker/teleport-lab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
# This container depends on the config written by the configure container above, so it
# sleeps for a second on startup to allow the configure container to run first.
teleport:
image: quay.io/gravitational/teleport-lab:10
image: public.ecr.aws/gravitational/teleport-lab:10
container_name: teleport
entrypoint: /bin/sh
hostname: luna.teleport
Expand All @@ -24,7 +24,7 @@ services:

# The bootstrap container generates certificates and then immediately exits.
bootstrap:
image: quay.io/gravitational/teleport-lab:10
image: public.ecr.aws/gravitational/teleport-lab:10
container_name: teleport-bootstrap
entrypoint: /bin/sh
command: -c "/etc/teleport.d/scripts/generate-certs.sh"
Expand All @@ -41,7 +41,7 @@ services:
# openssh is a demo of openssh node
#
openssh:
image: quay.io/gravitational/teleport-lab:10
image: public.ecr.aws/gravitational/teleport-lab:10
container_name: openssh
hostname: mars.openssh.teleport
entrypoint: /bin/sh
Expand All @@ -60,7 +60,7 @@ services:
# term is a container with a terminal to try things out
#
term:
image: quay.io/gravitational/teleport-lab:10
image: public.ecr.aws/gravitational/teleport-lab:10
hostname: term
container_name: term
entrypoint: /bin/sh
Expand Down
4 changes: 2 additions & 2 deletions docker/teleport-quickstart.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
# The configure container starts, generates a config, writes it to
# /etc/teleport/teleport.yaml and then immediately exits.
configure:
image: quay.io/gravitational/teleport:10
image: public.ecr.aws/gravitational/teleport:10
container_name: teleport-configure
entrypoint: /bin/sh
hostname: localhost
Expand All @@ -14,7 +14,7 @@ services:
# This container depends on the config written by the configure container above, so it
# sleeps for a second on startup to allow the configure container to run first.
teleport:
image: quay.io/gravitational/teleport:10
image: public.ecr.aws/gravitational/teleport:10
container_name: teleport
entrypoint: /bin/sh
hostname: localhost
Expand Down
4 changes: 2 additions & 2 deletions docs/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -1078,8 +1078,8 @@
"version": "9.0.4"
},
"helm_repo_url": "https://charts.releases.teleport.dev",
"latest_oss_docker_image": "quay.io/gravitational/teleport:9.1.2",
"latest_ent_docker_image": "quay.io/gravitational/teleport-ent:9.1.2"
"latest_oss_docker_image": "public.ecr.aws/gravitational/teleport:9.1.2",
"latest_ent_docker_image": "public.ecr.aws/gravitational/teleport-ent:9.1.2"
}
},
"redirects": [
Expand Down
4 changes: 2 additions & 2 deletions docs/pages/enterprise/getting-started.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -347,9 +347,9 @@ SailPoint and others.

## Run Teleport Enterprise using Docker

We provide pre-built Docker images for every version of Teleport Enterprise. These images are hosted on quay.io.
We provide pre-built Docker images for every version of Teleport Enterprise. These images are hosted on Amazon ECR Public.

- [All tags under `quay.io/gravitational/teleport-ent` are Teleport Enterprise images](https://quay.io/repository/gravitational/teleport-ent?tag=latest\&tab=tags)
- [All tags under `public.ecr.aws/gravitational/teleport-ent` are Teleport Enterprise images](https://gallery.ecr.aws/gravitational/teleport-ent)

We currently only offer Docker images for `x86_64` architectures.

Expand Down
4 changes: 2 additions & 2 deletions docs/pages/includes/enterprise/docker-images.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ They are stable, and we recommend their use to easily keep your Teleport Enterpr
| - | - | - | - | - |
| `(=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) |
| `public.ecr.aws/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) |
| `public.ecr.aws/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) |

For testing, we always recommend that you use the latest release version of Teleport Enterprise, which is currently `(=teleport.latest_ent_docker_image=)`.
8 changes: 4 additions & 4 deletions docs/pages/installation.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ information on obtaining Teleport binaries compatible with Teleport Cloud.
<TabItem scope={["oss"]} label="Open Source">
We provide pre-built Docker images for every version of Teleport.

These images are hosted on quay.io. All tags under
`quay.io/gravitational/teleport`
[are Teleport Open Source images](https://quay.io/repository/gravitational/teleport?tag=latest\&tab=tags).
These images are hosted on Amazon ECR Public. All tags under
`public.ecr.aws/gravitational/teleport`
[are Teleport Open Source images](https://gallery.ecr.aws/gravitational/teleport).

The table below gives an idea of how our image naming scheme works. We offer
images that point to a static version of Teleport as well as images that are
Expand All @@ -84,7 +84,7 @@ date.
|Image name|Teleport version|Image automatically updated?|Image base|
|-|-|-|-|
|`(=teleport.latest_oss_docker_image=)`|The latest version of Teleport Open Source|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)|
|`public.ecr.aws/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)|

For testing, we always recommend that you use the latest released version of Teleport, which is currently `(=teleport.latest_oss_docker_image=)`.

Expand Down
4 changes: 2 additions & 2 deletions docs/pages/setup/guides/docker.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ $ docker version
<TabItem scope={["oss"]} label="Open Source">
We provide pre-built Docker images for every version of Teleport.

These images are hosted on quay.io. All tags under `quay.io/gravitational/teleport` [are Teleport Open Source images](https://quay.io/repository/gravitational/teleport?tag=latest\&tab=tags).
These images are hosted on Amazon ECR Public. All tags under `public.ecr.aws/gravitational/teleport` [are Teleport Open Source images](https://gallery.ecr.aws/gravitational/teleport).

The table below gives an idea of how our image naming scheme works. We offer images that
point to a static version of Teleport, as well as images that are automatically rebuilt
Expand All @@ -68,7 +68,7 @@ keep your Teleport installation up to date.
</thead>
<tbody>
<tr><td>`(=teleport.latest_oss_docker_image=)`</td><td>The latest version of Teleport Open Source (=version=)</td><td>Yes</td><td>[Ubuntu 20.04](https://hub.docker.com/\_/ubuntu)</td></tr>
<tr><td>`quay.io/gravitational/teleport:(=teleport.version=)`</td><td>The version specified in the image's tag (i.e. (=teleport.version=))</td><td>No</td><td>[Ubuntu 20.04](https://hub.docker.com/\_/ubuntu)</td></tr>
<tr><td>`public.ecr.aws/gravitational/teleport:(=teleport.version=)`</td><td>The version specified in the image's tag (i.e. (=teleport.version=))</td><td>No</td><td>[Ubuntu 20.04](https://hub.docker.com/\_/ubuntu)</td></tr>
</tbody>
</table>

Expand Down
4 changes: 2 additions & 2 deletions docs/preflight.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ This checklist is to be run prior to cutting the release branch.
- [ ] Update the CI buildbox image
- [ ] Update the `BUILDBOX_VERSION` in `build.assets/Makefile`
- [ ] Run `make dronegen` and ensure _all_ buildbox references in the resulting yaml refer to the new image
- [ ] Commit and merge. Drone should build new buildbox images and push to `quay.io`
- [ ] Once the new images are confirmed in `quay.io`, update the build yaml files under `.cloudbuild` to refer to the new image
- [ ] Commit and merge. Drone should build new buildbox images and push to `public.ecr.aws`
- [ ] Once the new images are confirmed in `public.ecr.aws`, update the build yaml files under `.cloudbuild` to refer to the new image
2 changes: 1 addition & 1 deletion operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ If it's a creation/modification:
If you don't have a cluster yet, you can start one by using the [minikube](https://minikube.sigs.k8s.io/docs/start/) tool.

#### Operator's docker image
You can obtain the docker image by pulling from `quay.io/gravitational/teleport`
You can obtain the docker image by pulling from `public.ecr.aws/gravitational/teleport`

#### HELM chart from Teleport with the operator
The [teleport-cluster Helm chart](../examples/chart/teleport-cluster) supports deploying the operator alongside teleport.
Expand Down

0 comments on commit 830794a

Please sign in to comment.