Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
gitlab-runner
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Seipel
gitlab-runner
Commits
abeab267
Commit
abeab267
authored
9 years ago
by
Kamil Trzcinski
Browse files
Options
Downloads
Patches
Plain Diff
Fix compilation error
parent
78e1c9bc
Branches
make-docker-concurrent
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
executors/docker/executor_docker.go
+1
-1
1 addition, 1 deletion
executors/docker/executor_docker.go
executors/docker/executor_docker_command.go
+4
-4
4 additions, 4 deletions
executors/docker/executor_docker_command.go
with
5 additions
and
5 deletions
executors/docker/executor_docker.go
+
1
−
1
View file @
abeab267
...
@@ -550,7 +550,7 @@ func (s *executor) createFromServiceDescription(description string, linksMap map
...
@@ -550,7 +550,7 @@ func (s *executor) createFromServiceDescription(description string, linksMap map
return
return
}
}
func
(
s
*
executor
)
startServices
()
(
services
servicesLinks
,
error
)
{
func
(
s
*
executor
)
startServices
()
(
services
servicesLinks
,
err
error
)
{
serviceNames
,
err
:=
s
.
getServiceNames
()
serviceNames
,
err
:=
s
.
getServiceNames
()
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
return
nil
,
err
...
...
This diff is collapsed.
Click to expand it.
executors/docker/executor_docker_command.go
+
4
−
4
View file @
abeab267
...
@@ -12,15 +12,15 @@ import (
...
@@ -12,15 +12,15 @@ import (
type
commandExecutor
struct
{
type
commandExecutor
struct
{
executor
executor
containerOptions
*
docker
.
CreateContainerOptions
containerOptions
*
docker
.
CreateContainerOptions
predefinedContainer
*
docker
.
Container
predefinedContainer
*
docker
.
Container
predefinedImage
*
docker
.
Image
predefinedImage
*
docker
.
Image
buildContainer
*
docker
.
Container
buildContainer
*
docker
.
Container
buildImage
string
buildImage
string
preparedServices
servicesLinks
preparedServices
servicesLinks
}
}
func
(
s
*
commandExecutor
)
Prepare
(
globalConfig
*
common
.
Config
,
config
*
common
.
RunnerConfig
,
build
*
common
.
Build
)
error
{
func
(
s
*
commandExecutor
)
Prepare
(
globalConfig
*
common
.
Config
,
config
*
common
.
RunnerConfig
,
build
*
common
.
Build
)
error
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment