Update traefik dependencies (docker/docker and related) (#1823)
Update traefik dependencies (docker/docker and related) - Update dependencies - Fix compilation problems - Remove vdemeester/docker-events (in docker api now) - Remove `integration/vendor` - Use `testImport` - update some deps. - regenerate the lock from scratch (after a `glide cc`)
This commit is contained in:
parent
7d178f49b4
commit
b7daa2f3a4
1301 changed files with 21476 additions and 150099 deletions
191
vendor/github.com/libkermit/compose/LICENSE
generated
vendored
Normal file
191
vendor/github.com/libkermit/compose/LICENSE
generated
vendored
Normal file
|
@ -0,0 +1,191 @@
|
|||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
https://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
Copyright 2015-2016 Vincent Demeester
|
||||
|
||||
Licensed 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
|
||||
|
||||
https://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.
|
61
vendor/github.com/libkermit/compose/check/compose.go
generated
vendored
Normal file
61
vendor/github.com/libkermit/compose/check/compose.go
generated
vendored
Normal file
|
@ -0,0 +1,61 @@
|
|||
// Package check aims to provide simple "helper" methods to ease the use of
|
||||
// compose (through libcompose) in (integration) tests using the go-check package.
|
||||
package check
|
||||
|
||||
import (
|
||||
"github.com/go-check/check"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/libkermit/compose"
|
||||
)
|
||||
|
||||
// Project holds compose related project attributes
|
||||
type Project struct {
|
||||
project *compose.Project
|
||||
}
|
||||
|
||||
// CreateProject creates a compose project with the given name based on the
|
||||
// specified compose files
|
||||
func CreateProject(c *check.C, name string, composeFiles ...string) *Project {
|
||||
project, err := compose.CreateProject(name, composeFiles...)
|
||||
c.Assert(err, check.IsNil,
|
||||
check.Commentf("error while creating compose project %s from %v", name, composeFiles))
|
||||
return &Project{
|
||||
project: project,
|
||||
}
|
||||
}
|
||||
|
||||
// Start creates and starts the compose project.
|
||||
func (p *Project) Start(c *check.C) {
|
||||
c.Assert(p.project.Start(), check.IsNil,
|
||||
check.Commentf("error while starting compose project"))
|
||||
}
|
||||
|
||||
// Stop shuts down and clean the project
|
||||
func (p *Project) Stop(c *check.C) {
|
||||
c.Assert(p.project.Stop(), check.IsNil,
|
||||
check.Commentf("error while stopping compose project"))
|
||||
}
|
||||
|
||||
// Scale scale a service up
|
||||
func (p *Project) Scale(c *check.C, service string, count int) {
|
||||
c.Assert(p.project.Scale(service, count), check.IsNil,
|
||||
check.Commentf("error while scaling the service '%s'", service))
|
||||
}
|
||||
|
||||
// Containers lists containers for a given services.
|
||||
func (p *Project) Containers(c *check.C, service string) []types.ContainerJSON {
|
||||
containers, err := p.project.Containers(service)
|
||||
c.Assert(err, check.IsNil,
|
||||
check.Commentf("error while getting the containers for service '%s'", service))
|
||||
return containers
|
||||
}
|
||||
|
||||
// Container return the one and only container for a given services.
|
||||
// It fails if there is more than one container for the service.
|
||||
func (p *Project) Container(c *check.C, service string) types.ContainerJSON {
|
||||
container, err := p.project.Container(service)
|
||||
c.Assert(err, check.IsNil,
|
||||
check.Commentf("error while getting the container for service '%s'", service))
|
||||
return container
|
||||
}
|
175
vendor/github.com/libkermit/compose/compose.go
generated
vendored
Normal file
175
vendor/github.com/libkermit/compose/compose.go
generated
vendored
Normal file
|
@ -0,0 +1,175 @@
|
|||
// Package compose aims to provide simple "helper" methods to ease the use of
|
||||
// compose (through libcompose) in (integration) tests.
|
||||
package compose
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"golang.org/x/net/context"
|
||||
|
||||
"github.com/docker/docker/api/types"
|
||||
"github.com/docker/docker/api/types/filters"
|
||||
"github.com/docker/docker/client"
|
||||
"github.com/docker/libcompose/config"
|
||||
"github.com/docker/libcompose/docker"
|
||||
"github.com/docker/libcompose/docker/ctx"
|
||||
"github.com/docker/libcompose/project"
|
||||
"github.com/docker/libcompose/project/events"
|
||||
"github.com/docker/libcompose/project/options"
|
||||
d "github.com/libkermit/docker"
|
||||
)
|
||||
|
||||
// Project holds compose related project attributes
|
||||
type Project struct {
|
||||
composeProject project.APIProject
|
||||
name string
|
||||
listenChan chan events.Event
|
||||
started chan struct{}
|
||||
stopped chan struct{}
|
||||
deleted chan struct{}
|
||||
client client.APIClient
|
||||
}
|
||||
|
||||
// CreateProject creates a compose project with the given name based on the
|
||||
// specified compose files
|
||||
func CreateProject(name string, composeFiles ...string) (*Project, error) {
|
||||
// FIXME(vdemeester) temporarly normalize the project name, should not be needed.
|
||||
r := regexp.MustCompile("[^a-z0-9]+")
|
||||
name = r.ReplaceAllString(strings.ToLower(name), "")
|
||||
|
||||
apiClient, err := client.NewEnvClient()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// FIXME(vdemeester) fix this
|
||||
apiClient.UpdateClientVersion(d.CurrentAPIVersion)
|
||||
composeProject, err := docker.NewProject(&ctx.Context{
|
||||
Context: project.Context{
|
||||
ComposeFiles: composeFiles,
|
||||
ProjectName: name,
|
||||
},
|
||||
}, &config.ParseOptions{
|
||||
Interpolate: true,
|
||||
Validate: true,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
p := &Project{
|
||||
composeProject: composeProject,
|
||||
name: name,
|
||||
listenChan: make(chan events.Event),
|
||||
started: make(chan struct{}),
|
||||
stopped: make(chan struct{}),
|
||||
deleted: make(chan struct{}),
|
||||
client: apiClient,
|
||||
}
|
||||
|
||||
// Listen to compose events
|
||||
go p.startListening()
|
||||
p.composeProject.AddListener(p.listenChan)
|
||||
|
||||
return p, nil
|
||||
}
|
||||
|
||||
// Start creates and starts the compose project.
|
||||
func (p *Project) Start() error {
|
||||
ctx := context.Background()
|
||||
err := p.composeProject.Create(ctx, options.Create{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = p.composeProject.Start(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// Wait for compose to start
|
||||
<-p.started
|
||||
close(p.started)
|
||||
return nil
|
||||
}
|
||||
|
||||
// Stop shuts down and clean the project
|
||||
func (p *Project) Stop() error {
|
||||
// FIXME(vdemeester) handle timeout
|
||||
ctx := context.Background()
|
||||
err := p.composeProject.Stop(ctx, 10)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
<-p.stopped
|
||||
close(p.stopped)
|
||||
|
||||
err = p.composeProject.Delete(ctx, options.Delete{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
<-p.deleted
|
||||
close(p.deleted)
|
||||
return nil
|
||||
}
|
||||
|
||||
// Scale scale a service up
|
||||
func (p *Project) Scale(service string, count int) error {
|
||||
return p.composeProject.Scale(context.Background(), 10, map[string]int{
|
||||
service: count,
|
||||
})
|
||||
}
|
||||
|
||||
func (p *Project) startListening() {
|
||||
for event := range p.listenChan {
|
||||
// FIXME Add a timeout on event ?
|
||||
if event.EventType == events.ProjectStartDone {
|
||||
p.started <- struct{}{}
|
||||
}
|
||||
if event.EventType == events.ProjectStopDone {
|
||||
p.stopped <- struct{}{}
|
||||
}
|
||||
if event.EventType == events.ProjectDeleteDone {
|
||||
p.deleted <- struct{}{}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Containers lists containers for a given services.
|
||||
func (p *Project) Containers(service string) ([]types.ContainerJSON, error) {
|
||||
ctx := context.Background()
|
||||
containers := []types.ContainerJSON{}
|
||||
// Let's use engine-api for now as there is nothing really useful in
|
||||
// libcompose for now.
|
||||
filter := filters.NewArgs()
|
||||
filter.Add("label", "com.docker.compose.project="+p.name)
|
||||
filter.Add("label", "com.docker.compose.service="+service)
|
||||
containerList, err := p.client.ContainerList(ctx, types.ContainerListOptions{
|
||||
Filters: filter,
|
||||
})
|
||||
if err != nil {
|
||||
return containers, err
|
||||
}
|
||||
for _, c := range containerList {
|
||||
container, err := p.client.ContainerInspect(ctx, c.ID)
|
||||
if err != nil {
|
||||
return containers, err
|
||||
}
|
||||
containers = append(containers, container)
|
||||
}
|
||||
return containers, nil
|
||||
}
|
||||
|
||||
// Container returns the one and only container for a given services. It returns an error
|
||||
// if the service has more than one container (in case of scale)
|
||||
func (p *Project) Container(service string) (types.ContainerJSON, error) {
|
||||
containers, err := p.Containers(service)
|
||||
if err != nil {
|
||||
return types.ContainerJSON{}, err
|
||||
}
|
||||
if len(containers) > 1 {
|
||||
return types.ContainerJSON{}, fmt.Errorf("More than one container are running for '%s' service", service)
|
||||
}
|
||||
if len(containers) == 0 {
|
||||
return types.ContainerJSON{}, fmt.Errorf("No container found for '%s' service", service)
|
||||
}
|
||||
return containers[0], nil
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue