Skip to content

Commit

Permalink
Merge f6a2045 into 72e5615
Browse files Browse the repository at this point in the history
  • Loading branch information
sevignyj committed Mar 1, 2023
2 parents 72e5615 + f6a2045 commit 3ef26d1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export DOCKER_CONTENT_TRUST=1
then

``` txt
docker run --rm -it tokendito --version
docker run --rm -it tokendito/tokendito --version
```

You must map a volume in the Docker command to allow tokendito to write AWS credentials to your local system for use. This is done with the `-v` flag. See [Docker documentation](https://docs.docker.com/engine/reference/commandline/run/#-mount-volume--v---read-only) for help setting the syntax. The following directories are used by tokendito and should be considered when mapping volumes:
Expand All @@ -87,13 +87,13 @@ These can be covered by mapping a single volume to both the host and container u
Be sure to set the `-it` flags to enable an interactive terminal session.

``` txt
docker run --rm -it -v ${home}:/home/tokendito/ tokendito
docker run --rm -it -v ${home}:/home/tokendito/ tokendito/tokendito
```

Tokendito command line arguments are supported as well.

``` txt
docker run --rm -it -v ${home}:/home/tokendito/ tokendito \
docker run --rm -it -v ${home}:/home/tokendito/ tokendito/tokendito \
--okta-tile https://acme.okta.com/home/amazon_aws/000000000000000000x0/123 \
--username username@example.com \
--okta-mfa push \
Expand All @@ -106,7 +106,7 @@ docker run --rm -it -v ${home}:/home/tokendito/ tokendito \
Tokendito profiles are supported while using containers provided the proper volume mapping exists.

``` txt
docker run -ti -v ${home}:/home/tokendito/ tokendito --profile my-profile-name
docker run -ti -v ${home}:/home/tokendito/ tokendito/tokendito --profile my-profile-name
```

## Tips, tricks, troubleshooting, examples, and more docs are [here](https://github.com/dowjones/tokendito/blob/main/docs/README.md)
Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ options:
--version Displays version and exit
--configure Prompt user for configuration parameters
--username OKTA_USERNAME
username to log in to Okta. You can also use the OKTA_USERNAME environment variable.
username to log in to Okta. You can also use the TOKENDITO_OKTA_USERNAME environment variable.
--password OKTA_PASSWORD
password to log in to Okta. You can also use the OKTA_PASSWORD environment variable.
password to log in to Okta. You can also use the TOKENDITO_OKTA_PASSWORD environment variable.
--profile USER_CONFIG_PROFILE
Tokendito configuration profile to use.
--config-file USER_CONFIG_FILE
Expand Down
4 changes: 2 additions & 2 deletions tokendito/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ def parse_cli_args(args):
"--username",
dest="okta_username",
help="username to log in to Okta. You can "
"also use the OKTA_USERNAME environment variable.",
"also use the TOKENDITO_OKTA_USERNAME environment variable.",
)
parser.add_argument(
"--password",
dest="okta_password",
help="password to log in to Okta. You "
"can also use the OKTA_PASSWORD environment variable.",
"can also use the TOKENDITO_OKTA_PASSWORD environment variable.",
)
parser.add_argument(
"--profile",
Expand Down

0 comments on commit 3ef26d1

Please sign in to comment.