Skip to content

Commit

Permalink
Update docker/README and its Dockerfile (gravitational#3400)
Browse files Browse the repository at this point in the history
* Add missing (make build) step for running teleport cluster in docker container
* Edit Dockerfile teleport-buildbox tag from :latest to :go1.13.2 to match the image tag from running "make docker" from root.
* Update root README about docker
  • Loading branch information
Lisa Kim authored Mar 4, 2020
1 parent 2ae4ebc commit a573fd2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,20 @@ $ sudo teleport start
In a production environment Teleport must run as root. But to play, just do `chown $USER /var/lib/teleport`
and run it under `$USER`, in this case you will not be able to login as someone else though.

If you wish to deploy Teleport inside a Docker container:
## Docker

### Deploy Teleport
If you wish to deploy Teleport inside a Docker container:
```
# This command will pull the Teleport container image for version 4.2.0
# Replace 4.2.0 with the version you need:
$ docker pull quay.io/gravitational/teleport:4.2.0
```
View latest tags on [Quay.io | gravitational/teleport](https://quay.io/repository/gravitational/teleport?tab=tags)

### For Local Testing and Development
Follow instructions at [docker/README](docker/README.md)

## Building Teleport

Teleport source code consists of the actual Teleport daemon binary written in Golang, and also
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The base image (buildbox:latest) is built by running `make -C build.assets`
# from the base repo directory $GOPATH/gravitational.com/teleport
FROM teleport-buildbox:latest
FROM teleport-buildbox:go1.13.2
RUN apt-get update
# DEBUG=1 is needed for the Web UI to be loaded from static assets instead
# of the binary
Expand Down
18 changes: 9 additions & 9 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ for testing & development purposes.

### Building

First, you need to build `teleport:latest` Docker image. This image is built
when you type `make build` BUT...
First, you need to build `teleport:latest` Docker image.

But you have to build the base image first, by running `make docker`
from `$GOPATH/github.com/gravitational/teleport` (repository base dir).
Run the following commands from `$GOPATH/github.com/gravitational/teleport` (repository base dir):

### Starting
```bash
$ make docker
$ cd docker
$ make build
```

Type:
### Starting

```bash
$ make up
Expand All @@ -26,10 +28,8 @@ This will start two Teleport clusters:

### Stopping

Type:

```bash
$ make stop
$ make down
```

### SSH
Expand Down

0 comments on commit a573fd2

Please sign in to comment.