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

Add support for Windows dial-in commands #118

Merged
merged 2 commits into from
Jan 4, 2023
Merged

Add support for Windows dial-in commands #118

merged 2 commits into from
Jan 4, 2023

Conversation

AlvaroRausell
Copy link
Contributor

This PR enables the user to add a custom Windows command to use for container dial-in, as opposed to the current hard-coded behaviour. On the agent template page, there is now a text area called Windows Command (the former Command text area has been renamed to Unix Command. The motivation behind this is my team's need to allow the containers to connect via cygwin as opposed to powershell. I also made it so one can write ${unixCommand} on the Windows Command field to interpolate the default bash behaviour without needing complicated parsing.

Closes issue #53.

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

@AlvaroRausell
Copy link
Contributor Author

@Roemer Would it be possible for you to have a look into it whenever you can please?

@Roemer Roemer merged commit 148d738 into jenkinsci:master Jan 4, 2023
@AlvaroRausell AlvaroRausell deleted the windows-command branch June 27, 2023 13:04
@@ -57,7 +58,7 @@ public DockerSwarmAgentTemplate() {

@DataBoundConstructor
public DockerSwarmAgentTemplate(final String image, final String hostBinds, final String hostNamedPipes, final String dnsIps,
final String dnsSearchDomains, final String command, final String user, final String workingDir,
final String dnsSearchDomains, final String unixCommand,final String windowsCommand, final String user, final String workingDir,
Copy link
Member

Choose a reason for hiding this comment

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

Note that this was an incompatible change. For example, a JCasC bundle that worked with 1.11 will not work with 1.12, and vice-versa. Recommend renaming unixCommand back to command before releasing this.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Many thanks for the hint! I created a PR to rename the needed parts: #127
Did I rename enough or do I need to rename more unixCommands to command?

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.

3 participants