Skip to content

Make it possible to disable OpenSSH server in Docker image

What does this MR do?

Make it possible to disable OpenSSH server in Docker image

Includes a simple heuristic if OpenSSH is needed.

I have moved the whole OpenSSH setup after the gitlab-ctl reconfigure, so we can inspect the generated setup (which services will be started) and base our initial decision if OpenSSH should be started on that. The heuristic can be skipped by setting the GITLAB_DISABLE_OPENSSH environment variable.

Tested with different configurations modeled after the 2k reference architecture to validate that the OpenSSH server is only started in the rails container and none other.

PS: I took the environment variable name from a suggestion in issue #9156, but it might be better to invert the name to avoid double-negation? For example, GITLAB_ENABLE_OPENSSH with a default value of "true"?

Related issues

First stab at implementing #9156 to get the discussion going.

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • MR title and description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • Latest Merge Result pipeline is green.
  • When ready for review, MR is labeled workflowready for review per the Distribution MR workflow.

For GitLab team members

If you don't have access to this, the reviewer should trigger these jobs for you during the review process.

  • The manual Trigger:ee-package jobs have a green pipeline running against latest commit.
  • If config/software or config/patches directories are changed, make sure the build-package-on-all-os job within the Trigger:ee-package downstream pipeline succeeded.
  • If you are changing anything SSL related, then the Trigger:package:fips manual job within the Trigger:ee-package downstream pipeline must succeed.
  • If CI configuration is changed, the branch must be pushed to dev.gitlab.org to confirm regular branch builds aren't broken.

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes.
  • Documentation created/updated.
  • Tests added.
  • Integration tests added to GitLab QA.
  • Equivalent MR/issue for the GitLab Chart opened.
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.
Edited by 🤖 GitLab Bot 🤖

Merge request reports

Loading