Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use original process spec for execs #38871

Merged
merged 1 commit into from
Mar 25, 2019
Merged

Conversation

crosbymichael
Copy link
Contributor

Fixes #38865

Signed-off-by: Michael Crosby crosbymichael@gmail.com

@crosbymichael
Copy link
Contributor Author

I have a dream that one day I'll make a PR to this repo and the tests will just pass instead of fail for some stupid reason

@cpuguy83
Copy link
Member

Definitely seems to be some regressions after the last swarmkit vendor update.

@thaJeztah
Copy link
Member

this is an odd one; https://jenkins.dockerproject.org/job/Docker-PRs-experimental/44458/console does that use exec (and no permissions because of this change?)

20:44:29 --- FAIL: TestTemplatedSecret (3.06s)
20:44:29     secret_test.go:221: Creating a new daemon
20:44:29     daemon.go:288: [da0323621fe41] waiting for daemon to start
20:44:29     daemon.go:320: [da0323621fe41] daemon started
20:44:29     secret_test.go:391: assertion failed: string "error injecting secret: open /go/src/github.com/docker/docker/bundles/test-integration/da0323621fe41/root/containers/e06dc8932fc969f6a5af2faa0ec942560f1d871ac9d32973318b019efaa569c5/mounts/secrets/wennbwjreg8g23oji16kxoiyj: read-only file system\r\n" does not contain "SERVICE_NAME=svc_TestTemplatedSecret\nthis is a secret\nthis is a config\n"
20:44:29     daemon.go:275: [da0323621fe41] exiting daemon

integration/container/exec_test.go Outdated Show resolved Hide resolved
daemon/exec.go Outdated Show resolved Hide resolved
@thaJeztah
Copy link
Member

Error comes from here

if err := ioutil.WriteFile(fPath, secret.Spec.Data, s.File.Mode); err != nil {
return errors.Wrap(err, "error injecting secret")
}

@codecov
Copy link

codecov bot commented Mar 14, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@6daf5ab). Click here to learn what that means.
The diff coverage is 0%.

@@            Coverage Diff            @@
##             master   #38871   +/-   ##
=========================================
  Coverage          ?   36.89%           
=========================================
  Files             ?      614           
  Lines             ?    45382           
  Branches          ?        0           
=========================================
  Hits              ?    16742           
  Misses            ?    26348           
  Partials          ?     2292

Copy link
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

integration/container/exec_test.go Outdated Show resolved Hide resolved
@cpuguy83 cpuguy83 added status/2-code-review status/failing-ci Indicates that the PR in its current state fails the test suite and removed status/4-merge labels Mar 15, 2019
@cpuguy83
Copy link
Member

:( Looks like some real CI failures.

@Random-Liu
Copy link

Are we going to get this into docker 18.09.4?

@crosbymichael
Copy link
Contributor Author

Looks like some timeouts on the CI right now

Fixes moby#38865

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@crosbymichael
Copy link
Contributor Author

I think this is good to go now, rs5-process seems to be having some unrelated issues

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thanks 🤗

@yongtang
Copy link
Member

All tests passed 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants