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 /certs/client and docker.sock to volumes for docker in docker #396

Merged
merged 5 commits into from
Nov 10, 2021

Conversation

kayman-mk
Copy link
Collaborator

@kayman-mk kayman-mk commented Oct 18, 2021

Description

For a docker in docker setup the /var/run/docker.sock and client certificates have to be mounted. This is now done by default. In addition /builds is also mounted to have all files from the pipeline/repository available inside the docker in docker.

This is a backport from mbluemer@e3a2be3 mentioned in #393

This is a backport from DNXLabs@7bf1079 mentioned in #393

Closes #393

Migrations required

Yes, if /var/run/docker.sock and/or /certs/client and/or /builds were added to runners_additional_volumes. Remove them from the variable and set runners_add_dind_volumes = true

Verification

Deployed this module into our development system and ran some jobs on it. Worked fine.
Verified the config.toml and checked the volume entry.

Documentation

We use pre-commit to update the Terraform inputs and outputs in the documentation via terraform-docs. Ensure you have installed those components.

@kayman-mk kayman-mk marked this pull request as ready for review October 18, 2021 19:18
template/runner-config.tpl Outdated Show resolved Hide resolved
@kayman-mk kayman-mk changed the title Add /certs/client and docker.sock to volumes for docker in docker WIP: Add /certs/client and docker.sock to volumes for docker in docker Oct 28, 2021
@kayman-mk kayman-mk marked this pull request as draft October 28, 2021 19:11
@kayman-mk kayman-mk changed the title WIP: Add /certs/client and docker.sock to volumes for docker in docker Add /certs/client and docker.sock to volumes for docker in docker Oct 28, 2021
@kayman-mk
Copy link
Collaborator Author

Verification still missing

@npalm
Copy link
Collaborator

npalm commented Oct 29, 2021

Thanks, will check asap

@kayman-mk
Copy link
Collaborator Author

Manual verification for combinations of runners_add_dind_volumes and runners_additional_volumes done. Config.toml looks good to me.

@kayman-mk kayman-mk marked this pull request as ready for review October 30, 2021 07:17
@kayman-mk kayman-mk requested a review from npalm October 30, 2021 12:27
Copy link
Collaborator

@npalm npalm left a comment

Choose a reason for hiding this comment

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

@kayman-mk thanks LGTM, need to test

@npalm npalm merged commit 3f79054 into cattle-ops:develop Nov 10, 2021
semantic-releaser bot pushed a commit that referenced this pull request Dec 9, 2021
## [4.36.0](4.35.0...4.36.0) (2021-12-09)

### Features

* Add /certs/client and docker.sock to volumes for docker in docker ([#396](#396)) ([3f79054](3f79054))
* Add variable for Docker registry mirror ([#400](#400)) ([e36c971](e36c971))
* Make check interval configurable for the runner ([#402](#402)) ([ed9989c](ed9989c))

### Bug Fixes

* Remove runner agents if provider assumed a role ([#401](#401)) ([9767603](9767603))
@semantic-releaser
Copy link
Contributor

🎉 This PR is included in version 4.36.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

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

Successfully merging this pull request may close these issues.

Backport features from forks
2 participants