Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates Docker pull URLs #1276

Merged
merged 2 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions content/docs/capabilities/high-availability.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ networks:
services:
pomerium-proxy:
hostname: pomerium-proxy
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
networks:
main: {}
volumes:
Expand All @@ -196,7 +196,7 @@ services:
- CERTIFICATE_AUTHORITY_FILE=/run/secrets/ca.pem
pomerium-authorize:
hostname: pomerium-authorize
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
networks:
main: {}
volumes:
Expand All @@ -208,7 +208,7 @@ services:
- CERTIFICATE_AUTHORITY_FILE=/run/secrets/ca.pem
pomerium-authenticate:
hostname: pomerium-authenticate
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml
secrets:
Expand All @@ -227,7 +227,7 @@ services:
- authenticate.localhost.pomerium.io
pomerium-databroker:
hostname: pomerium-databroker
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
networks:
main: {}
volumes:
Expand Down
4 changes: 2 additions & 2 deletions content/docs/courses/fundamentals/advanced-policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ Docker Compose:
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
environment:
Expand Down
4 changes: 2 additions & 2 deletions content/docs/courses/fundamentals/advanced-routes.md
Original file line number Diff line number Diff line change
Expand Up @@ -443,13 +443,13 @@ Docker Compose
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
environment:
Expand Down
4 changes: 2 additions & 2 deletions content/docs/courses/fundamentals/build-policies.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,13 @@ Docker Compose:
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
grafana:
Expand Down
8 changes: 4 additions & 4 deletions content/docs/courses/fundamentals/build-routes.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@ In your `docker-compose.yaml` file, add Grafana as a service:
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
grafana:
Expand Down Expand Up @@ -185,13 +185,13 @@ Docker Compose:
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
grafana:
Expand Down
8 changes: 4 additions & 4 deletions content/docs/courses/fundamentals/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,13 @@ Add the following configuration settings to `docker-compose.yaml`:
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
```
Expand Down Expand Up @@ -184,13 +184,13 @@ Docker Compose:
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
```
6 changes: 3 additions & 3 deletions content/docs/courses/fundamentals/jwt-verification.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ In your Docker Compose file, add the following environment variable to your Veri

```yaml title="docker-compose"
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
environment:
Expand Down Expand Up @@ -339,13 +339,13 @@ Docker Compose
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
environment:
Expand Down
2 changes: 1 addition & 1 deletion content/docs/courses/fundamentals/tcp-routes.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ In your Docker Compose file, bind mount your wildcard certificates as a volume i
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
# Mount your wildcard certificates:
- ./_wildcard.localhost.pomerium.io-key.pem:/pomerium/key.pem:ro
Expand Down
6 changes: 3 additions & 3 deletions content/docs/deploy/clients/pomerium-cli.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -92,21 +92,21 @@ The CLI utilizes a [minimal](https://github.com/GoogleContainerTools/distroless)
- `:vX.Y.Z`: which will pull the a [specific tagged release](https://github.com/pomerium/cli/tags).

```bash {2}
docker run pomerium/cli:v0.1.0 --version
docker run cr.pomerium.com/pomerium/cli:v0.1.0 --version
v0.1.0+53bfa4e
```

- `:latest`: which will pull the [most recent tagged release](https://github.com/pomerium/cli/releases).

```bash {2}
docker run pomerium/cli:latest --version
docker run cr.pomerium.com/pomerium/cli:latest --version
v0.2.0+87e214b
```

- `:main` : which will pull an image in sync with git's [main](https://github.com/pomerium/pomerium/tree/main) branch.

```bash
docker pull pomerium/cli:main
docker pull cr.pomerium.com/pomerium/cli:main
```

### Source
Expand Down
6 changes: 3 additions & 3 deletions content/docs/deploy/core.mdx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this still mention Docker Hub on line 85?

Original file line number Diff line number Diff line change
Expand Up @@ -95,19 +95,19 @@ Pomerium also provides [Docker container images](https://www.docker.com/resource
- `:vX.Y` corresponds to the latest patch release for a specific minor version (starting with v0.25).

```shell-session
$ docker pull pomerium/pomerium:v0.25
$ docker pull cr.pomerium.com/pomerium/pomerium:v0.25
```

- `:latest` corresponds to the [most recent tagged release](https://github.com/pomerium/pomerium/releases/latest).

```shell-session
$ docker pull pomerium/pomerium:latest
$ docker pull cr.pomerium.com/pomerium/pomerium:latest
```

- `:main` corresponds to the most recent development build from the [main](https://github.com/pomerium/pomerium/tree/main) git branch.

```shell-session
$ docker pull pomerium/pomerium:main
$ docker pull cr.pomerium.com/pomerium/pomerium:main
```

Rootless images for official releases are also published to provide additional security. In these images, Pomerium runs as the `nonroot` user. Depending on your deployment environment, you may need to grant the container additional [capabilities](https://linux-audit.com/linux-capabilities-hardening-linux-binaries-by-removing-setuid/) or change the [listen address](/docs/reference/address) to use a port number other than 443.
Expand Down
2 changes: 1 addition & 1 deletion content/docs/guides/code-server.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ In your `docker-compose.yaml` file, add the code-server and Pomerium services:
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
Expand Down
2 changes: 1 addition & 1 deletion content/docs/guides/gitlab.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ Integrations that use unique subdomains will require their own certificates and
...

pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
container_name: pomerium
volumes:
- ./srv/pomerium/config.yaml:/pomerium/config.yaml:ro
Expand Down
2 changes: 1 addition & 1 deletion content/docs/guides/jwt-verification.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Mac and Linux users can use DNSMasq to map the `*.localhost.pomerium.io` domain
driver: 'bridge'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
ports:
- '443:443'
volumes:
Expand Down
4 changes: 2 additions & 2 deletions content/docs/guides/local-oidc.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ You can use the same configuration examples below for other supported [identity
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
environment:
# Generate new secret keys. e.g. `head -c32 /dev/urandom | base64`
- COOKIE_SECRET=<redacted>
Expand All @@ -36,7 +36,7 @@ services:
- identityprovider

verify:
image: pomerium/verify
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000

Expand Down
4 changes: 2 additions & 2 deletions content/docs/identity-providers/oidc.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ services:
aliases:
- keycloak.localhost.pomerium.io
pomerium:
image: pomerium/pomerium:v0.23.0
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
environment:
JWKS_ENDPOINT: https://pomerium/.well-known/pomerium/jwks.json
```
Expand Down
4 changes: 2 additions & 2 deletions content/examples/docker/autocert.docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
environment:
# Generate new secret keys. e.g. `head -c32 /dev/urandom | base64`
- COOKIE_SECRET=V2JBZk0zWGtsL29UcFUvWjVDWWQ2UHExNXJ0b2VhcDI=
Expand All @@ -13,6 +13,6 @@ services:

# https://verify.corp.beyondperimeter.com --> Pomerium --> http://verify
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 80
4 changes: 2 additions & 2 deletions content/examples/docker/basic.docker-compose.yml.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
version: "3"
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
## Mount your config file: https://www.pomerium.com/docs/reference/
- ./config.yaml:/pomerium/config.yaml:ro
ports:
- 443:443
## https://verify.localhost.pomerium.io --> Pomerium --> http://verify
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
```
8 changes: 4 additions & 4 deletions content/examples/docker/nginx.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- /var/run/docker.sock:/tmp/docker.sock:ro

pomerium-authenticate:
image: pomerium/pomerium:latest # or `build: .` to build from source
image: cr.pomerium.com/pomerium/pomerium:latest # or `build: .` to build from source
restart: always
environment:
- SERVICES=authenticate
Expand Down Expand Up @@ -60,7 +60,7 @@ services:
- 443

pomerium-authorize:
image: pomerium/pomerium:latest # or `build: .` to build from source
image: cr.pomerium.com/pomerium/pomerium:latest # or `build: .` to build from source
restart: always
environment:
- SERVICES=authorize
Expand All @@ -77,7 +77,7 @@ services:
- 443

pomerium-databroker:
image: pomerium/pomerium:latest # or `build: .` to build from source
image: cr.pomerium.com/pomerium/pomerium:latest # or `build: .` to build from source
restart: always
environment:
- SERVICES=databroker
Expand All @@ -94,7 +94,7 @@ services:

# https://verify.corp.beyondperimeter.com
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 80
# https://hello.corp.beyondperimeter.com
Expand Down
4 changes: 2 additions & 2 deletions content/examples/enterprise/hosted-auth-docker.yaml.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
version: '3'
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
volumes:
- pgdata:/var/lib/postgresql/data
verify:
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
restart: always
Expand Down
4 changes: 2 additions & 2 deletions content/examples/jenkins/jenkins-docker-compose.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ networks:
main: {}
services:
pomerium:
image: pomerium/pomerium:latest
image: cr.pomerium.com/pomerium/pomerium:latest
volumes:
- ./config.yaml:/pomerium/config.yaml:ro
ports:
Expand All @@ -16,7 +16,7 @@ services:
verify:
networks:
main: {}
image: pomerium/verify:latest
image: cr.pomerium.com/pomerium/verify:latest
expose:
- 8000
jenkins:
Expand Down
Loading
Loading