Skip to content

Commit

Permalink
Update Teleport image and dumb-init path in Docker quickstart (gravit…
Browse files Browse the repository at this point in the history
  • Loading branch information
webvictim authored Oct 29, 2020
1 parent 77d6173 commit e32db1d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
6 changes: 3 additions & 3 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:4.3
image: quay.io/gravitational/teleport-ent:4.4
container_name: teleport-configure
entrypoint: /bin/sh
hostname: localhost
Expand All @@ -14,11 +14,11 @@ 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:4.3
image: quay.io/gravitational/teleport-ent:4.4
container_name: teleport
entrypoint: /bin/sh
hostname: localhost
command: -c "sleep 1 && /usr/local/bin/dumb-init teleport start -c /etc/teleport/teleport.yaml"
command: -c "sleep 1 && /usr/bin/dumb-init teleport start -c /etc/teleport/teleport.yaml"
ports:
- "3023:3023"
- "3025:3025"
Expand Down
6 changes: 3 additions & 3 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:4.3
image: quay.io/gravitational/teleport:4.4
container_name: teleport-configure
entrypoint: /bin/sh
hostname: localhost
Expand All @@ -14,11 +14,11 @@ 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:4.3
image: quay.io/gravitational/teleport:4.4
container_name: teleport
entrypoint: /bin/sh
hostname: localhost
command: -c "sleep 1 && /usr/local/bin/dumb-init teleport start -c /etc/teleport/teleport.yaml"
command: -c "sleep 1 && /usr/bin/dumb-init teleport start -c /etc/teleport/teleport.yaml"
ports:
- "3023:3023"
- "3025:3025"
Expand Down
4 changes: 3 additions & 1 deletion docs/postrelease.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ This checklist is to be run after cutting a release.

- [ ] Create PR to update default Teleport version, hash and Docker image tags in Teleport docs
- Example: https://github.com/gravitational/teleport/pull/4615
- [ ] Create PR to update default Teleport image referenced in docker/teleport-quickstart.yml and docker/teleport-ent-quickstart.yml (if this is a new major/minor release)
- Example: https://github.com/gravitational/teleport/pull/4655
- [ ] Create PR to update default AMI versions in Makefile and AMIs.md under https://github.com/gravitational/teleport/blob/master/assets/aws
- Example: https://github.com/gravitational/teleport/pull/4608
- [ ] Create PR to update default Teleport version in Helm charts (https://github.com/gravitational/teleport/blob/master/examples/chart)
- [ ] Update `CURRENT_VERSION_ROOT` and other previous versions in Drone `teleport-docker-cron` job (for a major release)
- Example: https://github.com/gravitational/teleport/pull/4602
- Example: https://github.com/gravitational/teleport/pull/4602

0 comments on commit e32db1d

Please sign in to comment.