Dockerfile.e2e: copy test sources#39150
Merged
thaJeztah merged 2 commits intomoby:masterfrom May 3, 2019
Merged
Conversation
kolyshkin
commented
Apr 27, 2019
thaJeztah
requested changes
Apr 27, 2019
Member
thaJeztah
left a comment
There was a problem hiding this comment.
Left some comments, but otherwise looks good 🤗
ef46a29 to
54cc090
Compare
Codecov Report
@@ Coverage Diff @@
## master #39150 +/- ##
=========================================
Coverage ? 37.01%
=========================================
Files ? 612
Lines ? 45428
Branches ? 0
=========================================
Hits ? 16815
Misses ? 26329
Partials ? 2284 |
Package "gotest.tools/assert" uses source introspection to print more info in case of assertion failure. When source code is not available, it prints an error instead. In other words, before this commit: > --- SKIP: TestCgroupDriverSystemdMemoryLimit (0.00s) > cgroupdriver_systemd_test.go:32: failed to parse source file: /go/src/github.com/docker/docker/integration/system/cgroupdriver_systemd_test.go: open /go/src/github.com/docker/docker/integration/system/cgroupdriver_systemd_test.go: no such file or directory > cgroupdriver_systemd_test.go:32: and after: > --- SKIP: TestCgroupDriverSystemdMemoryLimit (0.09s) > cgroupdriver_systemd_test.go:32: !hasSystemd() This increases the resulting image size by about 2 MB on my system (from 758 to 760 MB). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
54cc090 to
0deb18a
Compare
Contributor
Author
|
@seemethere PTAL (second patch) |
seemethere
approved these changes
May 1, 2019
thaJeztah
reviewed
May 1, 2019
Member
There was a problem hiding this comment.
This should do the job;
Suggested change
| ARG DOCKER_GITCOMMIT=${DOCKER_GITCOMMIT:-undefined} | |
| ARG DOCKER_GITCOMMIT=undefined |
1. There is no need to persist DOCKER_GITCOMMIT, as it's not needed for runtime, only for build. So, remove ENV. 2. In case $GITCOMMIT is not defined during build time (and it happens if .git directory is not present), we still need to have some value set, so set it to `undefined`. Otherwise we'll have something like > => ERROR [builder 2/3] RUN hack/make.sh build-integration-test-binary > ------ > > [builder 2/3] RUN hack/make.sh build-integration-test-binary: > moby#32 0.488 > moby#32 0.505 error: .git directory missing and DOCKER_GITCOMMIT not specified > moby#32 0.505 Please either build with the .git directory accessible, or specify the > moby#32 0.505 exact (--short) commit hash you are building using DOCKER_GITCOMMIT for > moby#32 0.505 future accountability in diagnosing build issues. Thanks! Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
seemethere
approved these changes
May 2, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
(this is a quick followup to #39116)
Package "gotest.tools/assert" uses source introspection to
print more info in case of assertion failure. When source code
is not available, it prints an error instead.
In other words, before this commit:
and after:
This increases the resulting image size by about 2 MB
on my system (from 758 to 760 MB).