Skip to content

Commit

Permalink
quay.io -> docker.io in the rest of the docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Flynn committed May 22, 2020
1 parent 9254f57 commit 21e27f2
Show file tree
Hide file tree
Showing 21 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions build-aux/help.mk
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ help.body ?= $(call _help.genbody,,$(help.body.vars))
# (Kubernaut) unclaim Destroy the cluster
# (Kubernaut) unproxy Shut down 'proxy'
# - release-bin Upload binaries to S3
# - release Cut a release; upload binaries to S3 and Docker images to Quay
# - release-docker Upload Docker images to Quay
# - release Cut a release; upload binaries to S3 and Docker images to $$RELEASE_REGISTRY
# - release-docker Upload Docker images to $$RELEASE_REGISTRY
#
# Using $(NAME) (falling back to "this project", since `help.mk`
# doesn't assume you set NAME) as the default category name solves
Expand Down
2 changes: 1 addition & 1 deletion docs/howtos/filter-dev-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ We've created an example filter that you can customize for your particular use c
value: https://127.0.0.1:8443
- name: AMBASSADOR_ADMIN_URL
value: http://127.0.0.1:8877
- image: quay.io/datawire/aes:$version$
- image: docker.io/datawire/aes:$version$
+ image: DOCKER_REGISTRY/aes-plugin:VERSION
imagePullPolicy: Always
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/install/bare-metal.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ spec:
serviceAccountName: ambassador
containers:
- name: ambassador
image: quay.io/datawire/ambassador:$version$
image: docker.io/datawire/ambassador:$version$
resources:
limits:
cpu: 1
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/install/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cannot be accessed.
By default, Ambassador Edge Stack uses a demo configuration to show some of its basic features. Get it running with Docker, and expose Ambassador Edge Stack on port 8080:

```
docker run -it -p 8080:8080 --name=ambassador --rm quay.io/datawire/aes:$version$ --demo
docker run -it -p 8080:8080 --name=ambassador --rm docker.io/datawire/aes:$version$ --demo
```

## 2. Ambassador Edge Stack's Diagnostics
Expand Down
4 changes: 2 additions & 2 deletions docs/topics/install/install-ambassador-oss.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ For example:
```yaml
image:
repository: quay.io/datawire/ambassador
repository: docker.io/datawire/ambassador
tag: $version$
enableAES: false
```
Expand All @@ -175,7 +175,7 @@ helm install ambassador datawire/ambassador -f values.yaml
You can also install the chart with the `--set` flag:

```
helm install ambassador datawire/ambassador --set image.repository=quay.io/datawire/ambassador --set image.tag=$version$ --set enableAES=false
helm install ambassador datawire/ambassador --set image.repository=docker.io/datawire/ambassador --set image.tag=$version$ --set enableAES=false
```

## Want More?
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/install/yaml-install.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ In a typical configuration workflow, Custom Resource Definitions (CRDs) are used
spec:
containers:
- name: backend
image: quay.io/datawire/quote:0.2.7
image: docker.io/datawire/quote:0.2.7
ports:
- name: http
containerPort: 8080
Expand Down
4 changes: 2 additions & 2 deletions docs/topics/running/debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ First, check to see if the Edge Policy Console is reachable. If it is successful
---- ------ ---- ---- -------
Normal Scheduled 4m default-scheduler Successfully assigned ambassador-85c4cf67b-4pfj2 to gke-ambassador-demo-default-pool-912378e5-dkxc
Normal SuccessfulMountVolume 4m kubelet, gke-ambassador-demo-default-pool-912378e5-dkxc MountVolume.SetUp succeeded for volume "ambassador-token-tmk94"
Normal Pulling 4m kubelet, gke-ambassador-demo-default-pool-912378e5-dkxc pulling image "quay.io/datawire/ambassador:0.40.0"
Normal Pulled 4m kubelet, gke-ambassador-demo-default-pool-912378e5-dkxc Successfully pulled image "quay.io/datawire/ambassador:0.40.0"
Normal Pulling 4m kubelet, gke-ambassador-demo-default-pool-912378e5-dkxc pulling image "docker.io/datawire/ambassador:0.40.0"
Normal Pulled 4m kubelet, gke-ambassador-demo-default-pool-912378e5-dkxc Successfully pulled image "docker.io/datawire/ambassador:0.40.0"
Normal Created 4m kubelet, gke-ambassador-demo-default-pool-912378e5-dkxc Created container
Normal Started 4m kubelet, gke-ambassador-demo-default-pool-912378e5-dkxc Started container
```
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/running/resolvers.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ and then add the `HOST_IP` environment variable to your Kubernetes deployment:
```yaml
containers:
- name: example
image: quay.io/datawire/ambassador:$version$
image: docker.io/datawire/ambassador:$version$
env:
- name: HOST_IP
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/running/running.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
service: ambassador
spec:
containers:
image: quay.io/datawire/aes:$version$
image: docker.io/datawire/aes:$version$
name: ambassador
restartPolicy: Always
securityContext:
Expand Down
2 changes: 1 addition & 1 deletion docs/topics/using/dev-portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ https://[email protected]/datawire/private-devportal-
Check out a local copy of your content repo (see `DEVPORTAL_CONTENT_URL` above) and from within run the following docker image:

```
docker run -it --rm --volume $PWD:/content --publish 8877:8877 quay.io/datawire/ambassador_pro:local-devportal-$aproVersion$
docker run -it --rm --volume $PWD:/content --publish 8877:8877 docker.io/datawire/ambassador_pro:local-devportal-$aproVersion$
```

and open `http://localhost:8877` in your browser. Any changes made locally to devportal content will be reflected immediately on page refresh
Expand Down
4 changes: 2 additions & 2 deletions docs/topics/using/edgectl/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ spec:
spec:
containers:
- name: telepresence-proxy
image: quay.io/datawire/aes:$version$
image: docker.io/datawire/aes:$version$
command: [ "traffic-manager" ]
ports:
- name: sshd
Expand Down Expand Up @@ -233,7 +233,7 @@ spec:
ports:
- containerPort: 8000 # Application port
- name: traffic-agent # Traffic Agent container (note 3)
image: quay.io/datawire/aes:$version$ # (note 4)
image: docker.io/datawire/aes:$version$ # (note 4)
ports:
- containerPort: 9900 # Traffic Agent listen port
env:
Expand Down
4 changes: 2 additions & 2 deletions docs/topics/using/filters/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,11 +175,11 @@ spec:
The `JWT` and `OAuth2` filters speak to other services over HTTP or HTTPS. If those services are configured to speak HTTPS using a self-signed certificate, attempting to talk to them will result in an error mentioning `ERR x509: certificate signed by unknown authority`. You can fix this by installing that self-signed certificate into the AES container following the standard procedure for Alpine Linux 3.8: Copy the certificate to `/usr/local/share/ca-certificates/` and then run `update-ca-certificates`. Note that the `aes` image sets `USER 1000`, but that `update-ca-certificates` needs to be run as root.

```Dockerfile
FROM quay.io/datawire/aes:$version$
FROM docker.io/datawire/aes:$version$
USER root
COPY ./my-certificate.pem /usr/local/share/ca-certificates/my-certificate.crt
RUN update-ca-certificates
USER 1000
```

When deploying the Ambassador Edge Stack, refer to that custom Docker image, rather than to `quay.io/datawire/aes:$version$`
When deploying the Ambassador Edge Stack, refer to that custom Docker image, rather than to `docker.io/datawire/aes:$version$`
2 changes: 1 addition & 1 deletion docs/tutorials/quickstart-demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ In a typical configuration workflow, Custom Resource Definitions (CRDs) are used
spec:
containers:
- name: backend
image: quay.io/datawire/quote:$quoteVersion$
image: docker.io/datawire/quote:$quoteVersion$
ports:
- name: http
containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion docs/yaml/backends/quote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
spec:
containers:
- name: backend
image: quay.io/datawire/quote:$quoteVersion$
image: docker.io/datawire/quote:$quoteVersion$
ports:
- name: http
containerPort: 8080
Expand Down
2 changes: 1 addition & 1 deletion docs/yaml/consul/ambassador-consul-connector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
terminationGracePeriodSeconds: 0
containers:
- name: consul-connect-integration
image: quay.io/datawire/ambassador_pro:consul_connect_integration-$aproVersion$
image: docker.io/datawire/ambassador_pro:consul_connect_integration-$aproVersion$
imagePullPolicy: Always
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion test/attic/1-parallel/009-grpc/grpcurl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# set -x

PROGRAM="$(basename $0)"
IMAGE="quay.io/datawire/grpcurl"
IMAGE="docker.io/datawire/grpcurl"
VERSION="latest"

# -it
Expand Down
4 changes: 2 additions & 2 deletions test/attic/1-parallel/011-websocket/web-basic/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: web-basic

profiles:
sandbox0:
dockerImage: quay.io/datawire/conntest:latest
dockerImage: docker.io/datawire/conntest:latest
namespace: ambassador-sbx0
replicas: 3
sandbox1:
dockerImage: quay.io/datawire/conntest:latest
dockerImage: docker.io/datawire/conntest:latest
namespace: ambassador-sbx0
replicas: 3
2 changes: 1 addition & 1 deletion test/attic/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ It will download `kubernaut` if necessary, allocate a `kubernaut` cluster, then
This is particularly useful when you have only made changes to the end-to-end tests

```
make AMBASSADOR_DOCKER_IMAGE=quay.io/datawire/ambassador:0.37.0 e2e
make AMBASSADOR_DOCKER_IMAGE=docker.io/datawire/ambassador:0.37.0 e2e
```

- Clean up test artifacts (among other generated junk)
Expand Down
2 changes: 1 addition & 1 deletion tools/sandbox/grpc_auth/docker-compose.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:

# curl -v -H "requested-cookie: foo, bar, baz" -H "requested-status:307" http://localhost:61880/echo-service/get
ambassador:
image: quay.io/datawire/ambassador:0.73.0
image: docker.io/datawire/ambassador:0.73.0
ports:
- 61880:8080
volumes:
Expand Down
2 changes: 1 addition & 1 deletion tools/sandbox/grpc_web/docker-compose.yaml.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3.5'

services:
ambassador:
image: quay.io/datawire/ambassador:0.73.0
image: docker.io/datawire/ambassador:0.73.0
ports:
# expose port 80 via 8080 on the host machine
- 7080:80
Expand Down
2 changes: 1 addition & 1 deletion tools/sandbox/http_auth/docker-compose.yml.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
# curl -v -H "requested-cookie: foo, bar, baz" -H "requested-status:200" http://localhost:61880/get
# curl -v -H "requested-cookie: foo, bar, baz" -H "requested-status:307" http://localhost:61892/get
ambassador:
image: quay.io/datawire/ambassador:0.73.0
image: docker.io/datawire/ambassador:0.73.0
ports:
- 61880:8080
volumes:
Expand Down

0 comments on commit 21e27f2

Please sign in to comment.