Skip to content
Snippets Groups Projects

Support for extended docker configuration in gitlab-ci.yml

Merged Tomasz Maczukin requested to merge feature/support-for-extended-docker-configuration into master
All threads resolved!

What does this MR do?

Adds support for some Docker configuration options set with .gitlab-ci.yml file. Needs gitlab-org/gitlab-ce!8578 to work, because .gitlab-ci.yml is parsed in GitLab CE/EE and then job configuration is send to Runner. This MR adds support for new configuration options available in job's payload.

Why was this MR needed?

Please look into: #1466 (closed), #1421 (closed), #1284 (closed) for reference.

Are there points in the code the reviewer needs to double check?

Does this MR meet the acceptance criteria?

  • Documentation created/updated
  • Tests
    • Added for this feature/bug
    • All builds are passing
  • Branch has no merge conflicts with master (if you do - rebase it please)

What are the relevant issue numbers?

Closes #1466 (closed), #1421 (closed), #1284 (closed)

Edited by Tomasz Maczukin

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @tmaczukin I believe that we should also implement that to Kubernetes. We use Kubernetes on pair with Docker nowadays and we should not introduce that big of the difference.

    Also, I don't see any documentation for that. Where we want to document compatibility of that feature?

  • Author Maintainer

    @ayufan I'm still working on this MR, so the documentation will be added. I can also update the Kubernetes executor. Just wanted to have an early response about the approach taken here :)

  • Tomasz Maczukin mentioned in issue #1454

    mentioned in issue #1454

  • Tomasz Maczukin changed milestone to %9.4

    changed milestone to %9.4

  • mentioned in issue #2460

  • Tomasz Maczukin resolved all discussions

    resolved all discussions

  • Author Maintainer

    @ayufan I've added support for Kubernetes. Documentation is on the way :)

  • assigned to @ayufan

  • Tomasz Maczukin changed the description

    changed the description

  • Kamil Trzcińśki changed milestone to %10.0

    changed milestone to %10.0

  • Kamil Trzcińśki changed milestone to %9.4

    changed milestone to %9.4

  • Kamil Trzcińśki approved this merge request

    approved this merge request

  • mentioned in issue #2625

  • Tomasz Maczukin mentioned in merge request !635 (merged)

    mentioned in merge request !635 (merged)

  • mentioned in issue #2636 (closed)

  • Tomasz Maczukin mentioned in merge request !641 (merged)

    mentioned in merge request !641 (merged)

  • @bikebilly @tmaczukin Can we get docs for this please? Support thought it could be relevant to something we need, but looking at the code it's not abundantly clear what this is, and how to use it.

  • Author Maintainer

    @lbot We've added documentation with gitlab-org/gitlab-ce!12164, in the same release when the feature was added. It's available at the links posted by @bikebilly.

  • Hello,

    I want to use those extended options (namely: alias) in /etc/gitlab-runner/config.toml. Is it possible?

    i.e (look at the services line):

    [[runners]]
      name = "foo"
      url = "https://gitlab.example.org/"
      token = "abcd"
      executor = "docker"
      [runners.docker]
        tls_verify = false
        image = "docker-registry.example.org:443/local_docker/paas:docker-latest"
        services = ["dind=docker-registry.example.org:443/local_docker/paas:docker-dind"]
        privileged = true
        disable_cache = false
        allowed_images = ["docker-registry.example.org:443/local_docker/paas:docker-latest"]
        allowed_services = ["docker-registry.example.org:443/local_docker/paas:docker-dind"]
        pull_policy = "always"
      [runners.cache]
  • Author Maintainer

    @sathieu No, this configuration is currently supported only from .gitlab-ci.yml file.

  • Please register or sign in to reply
    Loading