Commit Graph

1166 Commits

Author SHA1 Message Date
Daniel Nephin 36a7842089 Fix goimports failure on master.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-03 15:58:39 -04:00
Daniel Nephin c202b4b987 Merge pull request #13 from dnephin/cleanup-post-docker-stin
Small build client cleanup handling dockerfile from stdin
2017-05-03 15:45:41 -04:00
Daniel Nephin 589afd2f50 Merge pull request #9 from gdevillele/pr-update-makefile
update Makefile
2017-05-03 15:43:26 -04:00
Vincent Demeester 9e413798bf Merge pull request #20 from dnephin/more-lint
Add more lint checks
2017-05-03 20:53:30 +02:00
Gaetan de Villele 7f7e842702 define targets as “phony”, add comments, and mount docker.sock in dev target
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-05-03 11:14:06 -07:00
Daniel Nephin b86533c479 Add ineffassign linter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin 08af0f28c5 Add gocycle lint
Whitelist some existing offenders, and use a high limit for now.
This limit should decrese over time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin 8f73a12f9b Add deadcode linter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin 1378bf3dbe Add goimports to linting
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin 690ef8af79 Enable golint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:57:46 -04:00
Daniel Nephin 0a613971b9 Merge pull request #18 from dnephin/add-linter
Add gometalinter to CI
2017-05-02 17:54:02 -04:00
Daniel Nephin e3f677794a Add gometalinter to CI
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-05-02 17:15:56 -04:00
Gaetan 639764c00d Merge pull request #15 from gdevillele/pr-faster-build
improve speed of "go build" as well as "docker build"
2017-04-28 13:08:39 -07:00
Daniel Nephin a5044b4982 Move addDockerfileToBuildContext to the build package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-28 15:11:36 -04:00
Daniel Nephin b98e03d3b0 Extract dockerfile handling functions.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-28 15:11:36 -04:00
Daniel Nephin 59983759c2 Cleanup handling of the - for stdin
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-28 15:11:36 -04:00
Gaetan f5c8a61c9b Merge pull request #7 from gdevillele/pr-fix-service-ls-filter
remove service runtime filter from client
2017-04-28 10:48:25 -07:00
Gaetan 2075433f95 Merge pull request #16 from gdevillele/pr-add-test-target
add “test” target to makefiles
2017-04-28 10:47:51 -07:00
Gaetan de Villele 4d4203f7fd add “test” target and make CI use it
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 15:57:35 -07:00
Gaetan de Villele 5aa70d68b3 remove service runtime filter from client
it’s moving to the server.

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 15:07:20 -07:00
Gaetan de Villele 87449dbaa1 make go build and docker build operations faster
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 15:06:57 -07:00
Gaetan e8d0ecdf7e Merge pull request #14 from gdevillele/pr-circle-ci
add CircleCI config file
2017-04-27 14:58:58 -07:00
Gaetan de Villele 6b2a61a311 add circle ci config file
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 14:24:28 -07:00
Gaetan 7e7df40930 Merge pull request #10 from gdevillele/pr-ci-dockerfile
add Dockerfile for CI
2017-04-27 14:19:24 -07:00
Gaetan de Villele 9c3f1d9ae3 add Dockerfile for CI
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-27 13:36:29 -07:00
Daniel Nephin 728060a7eb Merge pull request #8 from tiborvass/fix-windows
windows: remove workaround for go#15286 and have compiling work on windows
2017-04-26 10:23:35 -04:00
Tibor Vass 97a4da4cf1 windows: remove workaround for go#15286 and have compiling work on windows
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-04-25 15:53:23 -07:00
Gaetan b37ea22b1e Merge pull request #3 from gdevillele/add-makefile
add Makefiles
2017-04-25 09:58:40 -07:00
Gaetan de Villele fb413981d3 add Makefiles and document their use in the README
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-25 09:57:06 -07:00
Gaetan 0f0b500cf3 Merge pull request #5 from gdevillele/add-gitignore
add gitignore file
2017-04-25 09:47:56 -07:00
Vincent Demeester a01a35fb84 Merge pull request #6 from aduermael/fix-path
fix docker/docker/cli path in comment
2017-04-25 09:33:17 +02:00
Adrien Duermael 763802b6a3 fix docker/docker/cli path in comment
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2017-04-24 11:31:08 -07:00
Daniel Nephin bbee80a62e Merge pull request #1 from dnephin/add-dockerfile
Add Dockerfile and fix vendor.conf
2017-04-21 13:19:54 -04:00
Gaetan de Villele acf4eab87b add gitignore file
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2017-04-21 11:49:00 -05:00
Daniel Nephin b6cba06801 Add a Dockerfile for building and testing.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-04-18 19:12:24 -04:00
Daniel Nephin 31c8672805 Update vendor.conf
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-04-18 18:35:14 -04:00
Daniel Nephin 6686ada6a4 Add vendor
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-17 18:12:58 -04:00
Daniel Nephin 10641c2aae Update imports.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-17 18:07:56 -04:00
Daniel Nephin f2559aa2e0 Add project files
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-04-17 17:49:33 -04:00
Daniel Nephin cdd7bc516b Import docker/docker/cmd/docker
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-04-17 17:44:40 -04:00
Daniel Nephin e8a454d8a6 Import docker/docker/client
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-04-17 17:41:20 -04:00
Daniel Nephin 1630fc40f8 Import docker/docker/cli
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-04-17 17:40:59 -04:00
Daniel Nephin 1302228707 init
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-04-17 17:40:37 -04:00
Vincent Demeester e5b7b7e87b Fix formatter unit test (moving to testify)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-04-17 17:32:52 +02:00
Daniel Nephin 31639e04ce Merge pull request #32614 from aaronlehmann/testify
Remove pkg/testutil/assert in favor of testify
2017-04-17 11:07:08 -04:00
Sebastiaan van Stijn 1d73df5fc2 Merge pull request #30962 from TheHipbot/30431-implement-format-for-history-with-docs
30431 implement format for history with docs
2017-04-16 10:34:41 -07:00
Aaron Lehmann 6029def4cb Remove pkg/testutil/assert in favor of testify
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.

I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.

In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.

In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-14 12:03:21 -07:00
Aaron Lehmann 50e74272d1 Remove pkg/testutil/assert in favor of testify
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.

I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.

In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.

In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-14 12:03:21 -07:00
Aaron Lehmann 7059a96e2e Remove pkg/testutil/assert in favor of testify
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.

I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.

In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.

In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-14 12:03:21 -07:00
Aaron Lehmann 5b855515e4 Hide zero-valued timestamps from service JSON
It was possible to see output like this:

        "UpdateStatus": {
            "State": "updating",
            "StartedAt": "2017-04-14T17:10:03.226607162Z",
            "CompletedAt": "1970-01-01T00:00:00Z",
            "Message": "update in progress"
        }

The timestamp fields were already changed to pointers, and left nil if
the timestamp value was zero. However the zero-value of a timestamp from
gRPC is different from the value Go considers to be zero. gRPC uses the
Unix epoch instead of Go's epoch. Therefore, check that the timestamp
does not match the Unix epoch.

Also, add " ago" to the timestamps as shown in "docker service inspect
--pretty", as they are shown as relative times.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-04-14 10:44:24 -07:00