Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[17.12] Support a proxy in splunk log driver#420

Merged
andrewhsu merged 3 commits intodocker-archive:17.12from
thaJeztah:17.12-backport-support-proxy-in-splunk-driver
Feb 19, 2018
Merged

[17.12] Support a proxy in splunk log driver#420
andrewhsu merged 3 commits intodocker-archive:17.12from
thaJeztah:17.12-backport-support-proxy-in-splunk-driver

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of moby/moby#36220 for 17.12

git checkout -b 17.12-backport-support-proxy-in-splunk-driver upstream/17.12
git cherry-pick -s -S -x -Xsubtree=components/engine 3c4537d5b33d951237ea5e4cc123953eda7a37e7
git cherry-pick -s -S -x -Xsubtree=components/engine 7d296522f68a80d540b20753ea0648171ee12825

no conflicts

@thaJeztah thaJeztah added this to the 17.12.1 milestone Feb 10, 2018
@thaJeztah
Copy link
Copy Markdown
Member Author

Whoops looks like this needs a revendor as well;

00:40:22 # github.com/docker/docker/daemon/logger/splunk
00:40:22 package github.com/docker/docker/daemon/logger/splunk (test)
00:40:22 	imports github.com/gotestyourself/gotestyourself/env
00:40:22 	imports github.com/gotestyourself/gotestyourself/assert: cannot find package "github.com/gotestyourself/gotestyourself/assert" in any of:
00:40:22 	/go/src/github.com/docker/docker/vendor/github.com/gotestyourself/gotestyourself/assert (vendor tree)
00:40:22 	/usr/local/go/src/github.com/gotestyourself/gotestyourself/assert (from $GOROOT)
00:40:22 	/go/src/github.com/gotestyourself/gotestyourself/assert (from $GOPATH)

pickup changes which use t.Helper()

Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 4ac4b69)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 3c4537d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 7d29652)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 17.12-backport-support-proxy-in-splunk-driver branch from 6c849ca to 5fcd931 Compare February 10, 2018 21:11
@thaJeztah
Copy link
Copy Markdown
Member Author

Added moby/moby@4ac4b69 (moby/moby#36034) for updated gotestyourself

Copy link
Copy Markdown
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Copy Markdown
Member Author

Test failure due to the hosted notary service having an outage this weekend;

Error:      	"unable to reach trust server at this time: 503." does not contain "you are not authorized to perform this operation: server

@andrewhsu andrewhsu merged commit 72f6b9a into docker-archive:17.12 Feb 19, 2018
@thaJeztah thaJeztah deleted the 17.12-backport-support-proxy-in-splunk-driver branch February 19, 2018 22:34
docker-jenkins pushed a commit that referenced this pull request Nov 5, 2019
[19.03] vendor: update buildkit to ff93519ee
Upstream-commit: 5d5083a57a1c071a935bc6a1be6b1b1cc5cf1ede
Component: engine
docker-jenkins pushed a commit that referenced this pull request Jan 21, 2020
Remove some remnants related to image-based builds
Upstream-commit: 7730ce0
Component: packaging
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 27, 2020
…upport-proxy-in-splunk-driver

[17.12] Support a proxy in splunk log driver
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
…upport-proxy-in-splunk-driver

[17.12] Support a proxy in splunk log driver
akrasnov-drv pushed a commit to drivenets/docker-ce that referenced this pull request Apr 23, 2023
…remnants

Remove some remnants related to image-based builds
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants