Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

gitlab-runner
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

4ef4d802

Commit 4ef4d802 authored 6 years ago by Kamil Trzciński

Downloads
- Plain Diff

Merge branch '3883-fix-dns-1123-with-docker-machine' into 'master'

Make new runner tokens compatible with docker-machine executor

Closes #3883

See merge request gitlab-org/gitlab-runner!1144

parents dd021465 7ae0170a

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

executors/docker/machine/name.go 2 additions, 1 deletion

executors/docker/machine/name.go
executors/docker/machine/name_test.go 36 additions, 2 deletions

executors/docker/machine/name_test.go
executors/kubernetes/executor_kubernetes.go 2 additions, 1 deletion

executors/kubernetes/executor_kubernetes.go
executors/kubernetes/executor_kubernetes_test.go 4 additions, 3 deletions

executors/kubernetes/executor_kubernetes_test.go
executors/kubernetes/util.go 0 additions, 24 deletions

executors/kubernetes/util.go
executors/kubernetes/util_test.go 0 additions, 29 deletions

executors/kubernetes/util_test.go
helpers/dns/test/test.go 16 additions, 0 deletions

helpers/dns/test/test.go
helpers/dns/utils.go 28 additions, 0 deletions

helpers/dns/utils.go
helpers/dns/utils_test.go 29 additions, 0 deletions

helpers/dns/utils_test.go

with 117 additions and 60 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment