forked from elastic/beats
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bring back support for really old Docker versions
Introducing API version negotiation (elastic#7165) brough support for new Docker versions, but broke support for versions in EOL. This change puts old API version (1.229 back on the default fallback, plus introduces version hardcoding through `DOCKER_API_VERSION` environment variable. I added some integration tests to check things are working. Fixes elastic#7542
- Loading branch information
Carlos Pérez-Aradros Herce
committed
Jul 10, 2018
1 parent
9d865a7
commit c8d91cd
Showing
3 changed files
with
85 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
// Licensed to Elasticsearch B.V. under one or more contributor | ||
// license agreements. See the NOTICE file distributed with | ||
// this work for additional information regarding copyright | ||
// ownership. Elasticsearch B.V. licenses this file to you under | ||
// the Apache License, Version 2.0 (the "License"); you may | ||
// not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, | ||
// software distributed under the License is distributed on an | ||
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
// KIND, either express or implied. See the License for the | ||
// specific language governing permissions and limitations | ||
// under the License. | ||
|
||
// +build integration | ||
|
||
package docker | ||
|
||
import ( | ||
"os" | ||
"testing" | ||
|
||
"github.com/docker/docker/api" | ||
"github.com/docker/docker/api/types" | ||
"github.com/stretchr/testify/assert" | ||
"golang.org/x/net/context" | ||
) | ||
|
||
func TestNewClient(t *testing.T) { | ||
host := "unix:///var/run/docker.sock" | ||
|
||
client, err := NewClient(host, nil, nil) | ||
assert.NoError(t, err) | ||
assert.NotNil(t, client) | ||
|
||
_, err = client.ContainerList(context.Background(), types.ContainerListOptions{}) | ||
assert.NoError(t, err) | ||
|
||
// This test only works on newer Docker versions (any supported one really) | ||
switch client.ClientVersion() { | ||
case "1.22": | ||
t.Skip("Docker version is too old for this test") | ||
case api.DefaultVersion: | ||
t.Logf("Using default API version: %s", api.DefaultVersion) | ||
default: | ||
t.Logf("Negotiated version: %s", client.ClientVersion()) | ||
} | ||
|
||
// Test we can hardcode version | ||
os.Setenv("DOCKER_API_VERSION", "1.22") | ||
|
||
client, err = NewClient(host, nil, nil) | ||
assert.NoError(t, err) | ||
assert.NotNil(t, client) | ||
assert.Equal(t, "1.22", client.ClientVersion()) | ||
|
||
_, err = client.ContainerList(context.Background(), types.ContainerListOptions{}) | ||
assert.NoError(t, err) | ||
} |