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

GUACAMOLE-753: Add TOTP auth method to Docker image #471

Merged
merged 1 commit into from
Mar 24, 2020
Merged

GUACAMOLE-753: Add TOTP auth method to Docker image #471

merged 1 commit into from
Mar 24, 2020

Conversation

benrubson
Copy link
Contributor

Hi,

This PR adds TOTP authentication method to the Docker image.
It's really helpful, making TOTP easy to use with Docker.

Let's merge this low-impact PR with #469 in a 1.1.1 Docker image ?

Many thanks 👍

guacamole-docker/bin/build-guacamole.sh Show resolved Hide resolved
guacamole-docker/bin/start.sh Outdated Show resolved Hide resolved
guacamole-docker/bin/start.sh Outdated Show resolved Hide resolved
@benrubson
Copy link
Contributor Author

Let's merge this @mike-jumper @necouchman ?
Many thanks 👍

guacamole-docker/bin/start.sh Outdated Show resolved Hide resolved
Copy link
Contributor

@jolentes jolentes left a comment

Choose a reason for hiding this comment

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

I have implemented almost exactly the same changes to integrate TOTP into my Guacamole Docker image.
I have reviewed the changes in this commit request, but not tested this code. I looks good to me though.

guacamole-docker/bin/start.sh Outdated Show resolved Hide resolved
@benrubson
Copy link
Contributor Author

Many thanks @jolentes for your positive feedback 👍

@benrubson
Copy link
Contributor Author

Many thanks @necouchman 👍

@necouchman necouchman merged commit e30f4c7 into apache:master Mar 24, 2020
@benrubson benrubson deleted the totp branch March 24, 2020 13:55
@benrubson
Copy link
Contributor Author

Perhaps I should have rather pushed to the staging/1.2.0 branch ?

@necouchman
Copy link
Contributor

Sorry, it isn't slated for 1.2.0, it's slated for 1.3.0, so it was merged correctly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants