Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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 .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -808,9 +808,9 @@ steps:
# increment these variables when a new major/minor version is released to bump the automatic builds
# this only needs to be done on the master branch, as that's the branch that the Drone cron is configured for
# build major version images which are just teleport:x
CURRENT_VERSION_ROOT: v12
PREVIOUS_VERSION_ONE_ROOT: v11
PREVIOUS_VERSION_TWO_ROOT: v10
CURRENT_VERSION_ROOT: v14
PREVIOUS_VERSION_ONE_ROOT: v13
PREVIOUS_VERSION_TWO_ROOT: v12
commands:
- apk --update --no-cache add curl go
- mkdir -p /go/build && cd /go/build
Expand Down Expand Up @@ -12048,6 +12048,6 @@ image_pull_secrets:
- DOCKERHUB_CREDENTIALS
---
kind: signature
hmac: 6037e6bdee3255d8eebea41cf0536df554378778bc536aeaf075eb65dcda82ff
hmac: 4ebe6803bd4211a77094240d8e91c2cc9ac7e9b97956e277fbfa3b5e52962fdd

...
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: public.ecr.aws/gravitational/teleport-lab:12
image: public.ecr.aws/gravitational/teleport-lab:14
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: public.ecr.aws/gravitational/teleport-lab:12
image: public.ecr.aws/gravitational/teleport-lab:14
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: public.ecr.aws/gravitational/teleport-lab:12
image: public.ecr.aws/gravitational/teleport-lab:14
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: public.ecr.aws/gravitational/teleport-lab:12
image: public.ecr.aws/gravitational/teleport-lab:14
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: public.ecr.aws/gravitational/teleport:12
image: public.ecr.aws/gravitational/teleport:14
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: public.ecr.aws/gravitational/teleport:12
image: public.ecr.aws/gravitational/teleport:14
container_name: teleport
entrypoint: /bin/sh
hostname: localhost
Expand Down
2 changes: 1 addition & 1 deletion docs/postrelease.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ is published, since the PR will include an update to the plugins version as well
- [ ] Update support matrix in docs FAQ page
- [ ] Update `branchMajorVersion` const in Dronegen `/dronegen/container_images.go`, then run `make dronegen`
- Example: https://github.com/gravitational/teleport/pull/4602
- [ ] Create PR to update default Teleport image referenced in docker/teleport-quickstart.yml and docker/teleport-ent-quickstart.yml
- [ ] Create PR to update default Teleport image referenced in docker/teleport-quickstart.yml
- Example: https://github.com/gravitational/teleport/pull/4655
- [ ] Create PR to update default Teleport image referenced in docker/teleport-lab.yml