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-1746: Docker Allow usage of custom keystore and custom certificat #1068

Open
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

@tiborauer tiborauer changed the title GUACAMOLE-1746: Docker Allow usage of custom keystore and custom certificat and GUACAMOLE-1524: Importing LDAPS certificate into docker container GUACAMOLE-1524: Importing LDAPS certificate into docker container and GUACAMOLE-1746: Docker Allow usage of custom keystore and custom certificat Mar 7, 2025
@necouchman
Copy link
Contributor

@tiborauer Thank you for picking this up. Aside from the actual changes, there are a couple of logistical things that need to be addressed with this pull request:

  • Please choose a single Jira item and tag it with that, don't try to do both. I'd recommend using 1746, as it is still open and 1524 is closed.
  • All of your commit messages need to be tagged with the GUACAMOLE-1746: prefix.
  • Your commit messages are going to need to be updated a bit to be more descriptive - the message should not be duplicated, and they should describe what the commit entails without just duplicating the content of the commit. See https://www.codelord.net/2015/03/16/bad-commit-messages-hall-of-shame/ for some hints on that :-).

@tiborauer tiborauer changed the title GUACAMOLE-1524: Importing LDAPS certificate into docker container and GUACAMOLE-1746: Docker Allow usage of custom keystore and custom certificat GUACAMOLE-1746: Docker Allow usage of custom keystore and custom certificat Mar 7, 2025
@tiborauer
Copy link
Author

Hi @necouchman,

  • Re tagging: Can you elaborate on it a bit? Do I tag the PR with the JIRA item or the other way around?
  • How do I edit the commit messages? Do you suggest recreating them?

@necouchman
Copy link
Contributor

Hi @necouchman,

  • Re tagging: Can you elaborate on it a bit? Do I tag the PR with the JIRA item or the other way around?

Both PR and Commit messages should be tagged with the Jira item. The PR you've done correctly, here, with the GUACMAOLE-1746: Docker allow usage of custom keystore and custom certificate.

However, the commit messages need this same GUACAMOLE-1746 prepended to the beginning of the message, for example:
GUACAMOLE-1746: Add the environment variables for custom keystore and certificate to the docker startup script.

You can look at other in-progress or merged PRs to see examples of this.

  • How do I edit the commit messages? Do you suggest recreating them?

I find that the easiest way to do this is to do an interactive rebase (git rebase -i <COMMIT BEFORE YOUR COMMIT>), then, for each commit message you want to re-word, change the "pick" to "r" or "reword", edit the commit messages for each commit, and finally force-push the commits (git push -f). This will automatically update the PR, as well.

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.

2 participants