From abeab2672c0766ebcbb2312da475fddee84c8958 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 7 Jun 2016 13:21:44 +0200
Subject: [PATCH] Fix compilation error
---
executors/docker/executor_docker.go | 2 +-
executors/docker/executor_docker_command.go | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/executors/docker/executor_docker.go b/executors/docker/executor_docker.go
index fa0d4f457..3d464f96c 100644
--- a/executors/docker/executor_docker.go
+++ b/executors/docker/executor_docker.go
@@ -550,7 +550,7 @@ func (s *executor) createFromServiceDescription(description string, linksMap map
return
}
-func (s *executor) startServices() (services servicesLinks, error) {
+func (s *executor) startServices() (services servicesLinks, err error) {
serviceNames, err := s.getServiceNames()
if err != nil {
return nil, err
diff --git a/executors/docker/executor_docker_command.go b/executors/docker/executor_docker_command.go
index a890677f1..fa378f106 100644
--- a/executors/docker/executor_docker_command.go
+++ b/executors/docker/executor_docker_command.go
@@ -12,15 +12,15 @@ import (
type commandExecutor struct {
executor
- containerOptions *docker.CreateContainerOptions
+ containerOptions *docker.CreateContainerOptions
predefinedContainer *docker.Container
predefinedImage *docker.Image
- buildContainer *docker.Container
- buildImage string
+ buildContainer *docker.Container
+ buildImage string
- preparedServices servicesLinks
+ preparedServices servicesLinks
}
func (s *commandExecutor) Prepare(globalConfig *common.Config, config *common.RunnerConfig, build *common.Build) error {
--
GitLab