Skip to content
GitLab
Next
Projects
Groups
Snippets
Help
Loading...
Help
What's new
9
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
GitLab.org
gitlab-runner
Commits
db4accdb
Commit
db4accdb
authored
Aug 21, 2015
by
Kamil Trzciński
🔴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pin to specific Docker API version
parent
4325166c
Pipeline
#103541
passed with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
executors/docker/consts.go
executors/docker/consts.go
+3
-0
executors/docker/executor_docker.go
executors/docker/executor_docker.go
+3
-2
No files found.
executors/docker/consts.go
0 → 100644
View file @
db4accdb
package
docker
const
dockerAPIVersion
=
"1.18"
executors/docker/executor_docker.go
View file @
db4accdb
...
...
@@ -423,11 +423,12 @@ func (s *DockerExecutor) connect() (*docker.Client, error) {
}
if
tlsVerify
{
client
,
err
:=
docker
.
NewTLSClient
(
client
,
err
:=
docker
.
New
Versioned
TLSClient
(
endpoint
,
filepath
.
Join
(
tlsCertPath
,
"cert.pem"
),
filepath
.
Join
(
tlsCertPath
,
"key.pem"
),
filepath
.
Join
(
tlsCertPath
,
"ca.pem"
),
dockerAPIVersion
,
)
if
err
!=
nil
{
return
nil
,
err
...
...
@@ -435,7 +436,7 @@ func (s *DockerExecutor) connect() (*docker.Client, error) {
return
client
,
nil
}
else
{
client
,
err
:=
docker
.
NewClient
(
endpoint
)
client
,
err
:=
docker
.
New
Versioned
Client
(
endpoint
,
dockerAPIVersion
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment