Commit Graph

200 Commits

Author SHA1 Message Date
Sebastiaan van Stijn dfc81eda9c
bump docker/docker, sirupsen/logrus v1.4.1
Full diff: https://github.com/sirupsen/logrus/compare/v1.3.0...v1.4.1

Fixes:

- Remove dependency on golang.org/x/crypto
- Fix wrong method calls Logger.Print and Logger.Warningln
- Update Entry.Logf to not do string formatting unless the log level is enabled
- Fix infinite recursion on unknown Level.String()
- Fix race condition in getCaller
- Fix Entry.WithContext method to return a copy of the initial entry

New:

- Add DeferExitHandler, similar to RegisterExitHandler but prepending the handler to the list of handlers (semantically like defer)
- Add CallerPrettyfier to JSONFormatter and `TextFormatter`
- Add Entry.WithContext() and Entry.Context, to set a context on entries to be used e.g. in hooks
- Enhance TextFormatter to not print caller information when they are empty

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-04 17:46:51 +02:00
Tibor Vass 45ec86b10f vendor github.com/docker/docker to bcaa613d823
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-04-03 20:57:18 +00:00
Sebastiaan van Stijn 7ad850e58d
Merge pull request #1800 from tonistiigi/update-buildkit
vendor: update buildkit to 62e55427
2019-04-03 16:56:05 +02:00
Tonis Tiigi 198407c56b vendor: update buildkit to 62e55427
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2019-04-02 23:40:56 -07:00
Nick Adcock 0b6685bca8 bump kubernetes to v1.14.0
bump required:
- replacing vendor ghodss/yaml with sigs.k8s.io/yaml
- adding vendor k8s.io/klog and github.com/evanphx
- compose-on-kubernetes
removed 'IncludeUninitialized' from watch as it have been removed from k8s

Signed-off-by: Nick Adcock <nick.adcock@docker.com>
2019-03-29 09:20:28 +00:00
Tibor Vass 5b70f5a2da
Merge pull request #1763 from thaJeztah/bump_docker_licensing
bump docker/licensing to 9781369abdb5281cdc07a2a446c6df01347ec793
2019-03-20 13:57:08 -07:00
Silvin Lubecki 91339e1108
Merge pull request #1758 from thaJeztah/bump_some_deps
Update some dependencies
2019-03-20 21:26:33 +01:00
Sebastiaan van Stijn 5ac07c795f
bump docker/licensing to 9781369abdb5281cdc07a2a446c6df01347ec793
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-20 18:52:19 +01:00
Sebastiaan van Stijn aaffb71746
vendor golang.org/x/sync 42b317875d0fa942474b76e1b46a6060d720ae6e
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 22:22:03 +01:00
Sebastiaan van Stijn e06dedf365
bump containerd, runc and dependencies
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 22:22:00 +01:00
Sebastiaan van Stijn 208d69918d
vendor swarmkit 415dc72789e2b733ea884f09188c286ca187d8ec
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 22:21:57 +01:00
Sebastiaan van Stijn 5ccaaef8c1
vendor golang.org/x/sys d455e41777fca6e8a5a79e34a14b8368bc11d9ba
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 22:21:54 +01:00
Sebastiaan van Stijn fd769e1aff
Update docker/docker to 827cb09f87964ed38b46502f22a585f2ed4a78e1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 22:21:51 +01:00
Sebastiaan van Stijn 84d34d959a
bump imdario/mergo v0.3.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 17:13:08 +01:00
Sebastiaan van Stijn 5db2f9e301
bump json-iterator/go 1.1.6
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 17:13:03 +01:00
Sebastiaan van Stijn a29b0c945d
bump mattn/go-shellwords v1.0.5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 17:13:00 +01:00
Sebastiaan van Stijn 0f0cedc5ac
bump github.com/pkg/errors v0.8.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-19 17:12:57 +01:00
Sebastiaan van Stijn 05fd2a87dc
Update containerd 1.2.4 and dependencies
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-02 13:44:57 +01:00
Sebastiaan van Stijn 087a7ee712
bump github.com/gorilla/mux v1.7.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-02 13:42:07 +01:00
Sebastiaan van Stijn 0fc0015173
bump docker/docker to 8aca18d631f3f72d4c6e3dc01b6e5d468ad941b8
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-02 13:41:42 +01:00
Justin Cormack cb3e55bf58
Update PKCS11 library
The new version no longer links to libltdl which simplifies build
and dependencies.

See https://github.com/theupdateframework/notary/pull/1434

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2019-02-26 11:45:19 +00:00
Sebastiaan van Stijn d034df736b
Update docker, swarmkit, containerd v1.2.2
Also update the tests to account for the new "Builder" field
in docker info.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-02 17:03:12 +01:00
Sebastiaan van Stijn 7df6bb51ab
Update github.com/containerd/continuity
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-02 13:31:09 +01:00
Sebastiaan van Stijn f353eeb544
Update containerd to 1.2.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-02 13:30:55 +01:00
Simon Ferquel e9b7db5b4c Vendoring update for pull secrets and policies
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2019-01-29 10:03:32 +01:00
Simon Ferquel c863dbabf7 Vendoring update for v1alpha3
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2019-01-24 11:43:52 +01:00
Simon Ferquel e16a875408 Make child resource creation atomic when creating a k8s stack
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2019-01-22 11:25:41 +01:00
Daniel Hiltgen f73bd83419
Bump licensing library
Removes the billing profile flow which is now handled on the back-end.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 8e565d0399)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-01-08 00:35:18 +01:00
Olli Janatuinen 0ac5c15fd4 bump docker to f76d6a078d881f410c00e8d900dcdfc2e026c841
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
2018-12-31 07:45:37 +02:00
Jérémie Drouet 8a634aa578 alias kubernetes api to compose-on-kubernetes implementation
Signed-off-by: Jérémie Drouet <jeremie.drouet@gmail.com>
2018-12-28 15:49:17 +01:00
Tibor Vass b991b6236a prune: use filters.Args.Clone()
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-12-10 16:48:59 +00:00
Silvin Lubecki 69bd2728c4
Merge pull request #1509 from selansen/master
Data Path Port configuration support
2018-11-28 17:10:39 +01:00
selansen 052133a4f5 Vendor commit for Data Path Port configuration support
This commit brings Swarmkit and docker chnages

Signed-off-by: selansen <elango.siva@docker.com>
2018-11-26 15:58:44 -05:00
Ian Campbell 986196e3e3 Bump to gotest.tools v2.2.0
I would like to use the regex matcher

Signed-off-by: Ian Campbell <ijc@docker.com>
2018-11-14 11:40:09 +00:00
Simon Ferquel 561474d770 Vendoring bump for docker/docker
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2018-11-08 11:37:35 +01:00
Akihiro Suda db7399a016 build: add SSH agent socket forwarder (`docker build --ssh $SSHMOUNTID=$SSH_AUTH_SOCK`)
Unlike `docker build --secret`, `docker build --ssh` allows the build container to
use SSH keys with passphrases.

  $ eval $(ssh-agent)
  $ ssh-add ~/.ssh/id_rsa
  (Input your passphrase here)
  $ docker build --ssh default=$SSH_AUTH_SOCK ...

This feature requires the daemon with `CapExecMountSSH` build capability (moby/moby#37973) .

Currently, the official Dockerfile frontend does not provide the syntax for using the SSH forwarder.

However, the experimental `RUN --mount=type=ssh` syntax can be enabled by using
the Dockerfile frontend image built with the `BUILDTAGS="dfrunmount dfssh"`, via the `# syntax =` "shebang".

The Dockerfile for the Dockerfile frontend is available at  github.com/moby/buildkit/frontend/dockerfile/cmd/dockerfile-frontend)
The pre-built image is also available as `tonistiigi/dockerfile:ssh20181002` .

An example Dockerfile with `RUN --mount=type=ssh`:

  # syntax = tonistiigi/dockerfile:ssh20181002
  FROM alpine
  RUN apk add --no-cache openssh-client
  RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan gitlab.com >> ~/.ssh/known_hosts
  RUN --mount=type=ssh ssh git@gitlab.com | tee /hello
  # "Welcome to GitLab, @GITLAB_USERNAME_ASSOCIATED_WITH_SSHKEY" should be printed here

More info available at moby/buildkit#608, moby/buildkit#655

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-05 19:56:32 +09:00
Akihiro Suda 846c38cbd7 bump up buildkit
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-10-05 18:14:03 +09:00
Daniel Hiltgen 9cd6d5333d Vendor bump of licensing lib
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 41910b6d68)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-28 14:43:06 -07:00
Sebastiaan van Stijn 1833bc5ff3
Bump docker/swarmkit to 9f271c2963d18a7c60d2c4001fb418ca4037df19
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:59 +02:00
Sebastiaan van Stijn 8cfd24049f
Bump buildkit and dependencies to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:48 +02:00
Sebastiaan van Stijn 3170e5b8a9
Bump etcd dependencies
etcd was updated to v3.3.9 in 8788a4804f, but
dependencies were not bumped. This bumps dependencies to the same versions as
was done upstream in moby/moby

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:39 +02:00
Sebastiaan van Stijn 036b8f75e5
Bump containerd client to d97a907f7f781c0ab8340877d8e6b53cc7f1c2f6
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:28 +02:00
Sebastiaan van Stijn 943a2d1065
Bump Microsoft/hcsshim to v0.7.3, Microsoft/go-winio to v0.4.11
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:20 +02:00
Sebastiaan van Stijn 5e5538ee79
Bump github.com/docker/docker to 9f296d1e6fccd9f73bae345e4aad4f3f6e92fdeb
Relevant changes:

- moby#37701 Add support for sysctl options in services
- moby#37780 pkg/progress: work around closing closed channel panic
- moby#37829 Update copyright years
- moby#37770 Windows: Go1.11: Use long path in TestBuildSymlinkBreakout

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-09-26 15:45:09 +02:00
Daniel Hiltgen 7485ef6f60 Fix vendoring glitch
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit ec1812188f)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-21 15:43:33 -07:00
Michael Crosby eacb812c26 Install binaries on host for upgrade
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
(cherry picked from commit cfec8027ed)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-09-21 15:40:35 -07:00
Sebastiaan van Stijn 4ea2f9d386
Merge pull request #1324 from dhiltgen/dual_keys_master
Add support for multiple signing keys
2018-09-14 12:41:55 +02:00
Andrew Hsu f6af8b3dfb vndr docker/docker to 53e55db
And update the associated packages that have also updated from
docker/docker vendor.conf.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2018-09-06 00:44:39 +00:00
Tibor Vass c806eb49c9 build: add options to builder prune
This patch adds --filter, --keep-storage, --all and --force to builder prune.

Signed-off-by: Tibor Vass <tibor@docker.com>
2018-09-05 00:01:16 +00:00
Daniel Hiltgen e755349143 Vendor bump for licensing library to support multiple signing keys
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
(cherry picked from commit 264ee43c2a)
Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
2018-08-29 07:38:19 -07:00