mount: Add volume-subpath option #4331
Merged
Conversation
This file contains 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
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #4331 +/- ##
==========================================
- Coverage 61.31% 61.30% -0.01%
==========================================
Files 287 287
Lines 20058 20060 +2
==========================================
Hits 12298 12298
- Misses 6867 6869 +2
Partials 893 893 |
vvoland
force-pushed
the
mount-volsubpath
branch
2 times, most recently
from
2939ede
to
8177eea
Compare
vvoland
force-pushed
the
mount-volsubpath
branch
from
8177eea
to
bdfd828
Compare
vvoland
force-pushed
the
mount-volsubpath
branch
from
bdfd828
to
c56cb88
Compare
vvoland
changed the title
krissetto
reviewed
Jan 24, 2024
vvoland
force-pushed
the
mount-volsubpath
branch
from
c56cb88
to
854b996
Compare
vvoland
force-pushed
the
mount-volsubpath
branch
3 times, most recently
from
e26b50a
to
9f52b2f
Compare
vvoland
commented
Feb 9, 2024
e2e/container/run_test.go
Outdated
Comment on lines
154
to
155
| func TestMountSubvolume(t *testing.T) { | ||
| environment.SkipIfAPIOlder(t, "1.45") |
There was a problem hiding this comment.
Note: This test will be skipped currently (even with #4839) because the 25.0 is still on API 1.44.
I ran the tests (🟢) locally by substituting the dind image with:
FROM docker:25-dind
COPY --from=moby/moby-bin:master /dockerd /usr/local/bin/dockerdTests output
$ make -f docker.Makefile test-e2e
...
✓ e2e/cli-plugins (15.291s)
∅ e2e/cli-plugins/plugins/badmeta
∅ e2e/cli-plugins/plugins/nopersistentprerun
∅ e2e/cli-plugins/plugins/presocket
∅ e2e/internal/fixtures
✓ e2e/global (71ms)
✓ e2e/context (132ms)
∅ e2e/plugin/basic
✓ e2e/plugin (112ms)
✓ e2e/system (37ms)
✓ e2e/stack (264ms)
✓ e2e/trust (1.974s)
✓ e2e/container (5.198s)
✓ e2e/image (10.05s)
=== Skipped
=== SKIP: e2e/cli-plugins TestCLIPluginDialStdio (0.00s)
dial_test.go:16: skipping plugin dial-stdio test since DOCKER_CLI_PLUGIN_USE_DIAL_STDIO is not set
=== SKIP: e2e/container TestRunAttachedFromRemoteImageAndRemove (0.01s)
run_test.go:24: daemonPlatform != platform: running against a non linux/amd64 daemon
=== SKIP: e2e/container TestRunWithCgroupNamespace (0.06s)
run_test.go:147: !cgroupNsFound: running against a daemon that doesn't support cgroup namespaces (security options: [name=seccomp,profile=builtin]
)
=== SKIP: e2e/image TestPullWithContentTrust (0.01s)
pull_test.go:22: daemonPlatform != platform: running against a non linux/amd64 daemon
=== SKIP: e2e/image TestPushAllTags (0.01s)
push_test.go:37: daemonPlatform != platform: running against a non linux/amd64 daemon
=== SKIP: e2e/image TestPushWithContentTrust (0.01s)
push_test.go:59: daemonPlatform != platform: running against a non linux/amd64 daemon
=== SKIP: e2e/plugin TestInstallWithContentTrust (0.00s)
trust_test.go:26: skipping until a fix is implemented on moby
=== SKIP: e2e/trust TestSignLocalImage (0.01s)
sign_test.go:25: daemonPlatform != platform: running against a non linux/amd64 daemon
=== SKIP: e2e/trust TestSignWithLocalFlag (0.01s)
sign_test.go:43: daemonPlatform != platform: running against a non linux/amd64 daemon
sam-thibault
approved these changes
Feb 9, 2024
Merged
thaJeztah
reviewed
Feb 12, 2024
internal/test/environment/testenv.go
Outdated
Comment on lines
112
to
115
|
|
||
| func SkipIfAPIOlder(t *testing.T, minimumVersion string) { | ||
| t.Helper() | ||
| // Use Client.APIVersion instead of Server.APIVersion. |
There was a problem hiding this comment.
Wondering if we should try to make the UX a bit similar to what we have in docker/docker; https://github.com/moby/moby/blob/a60546b084eef87910345876e32c3db46e7c3bbc/integration-cli/docker_cli_build_test.go#L3338
There was a problem hiding this comment.
Done and extracted to #4873
vvoland
force-pushed
the
mount-volsubpath
branch
from
9f52b2f
to
1b7242a
Compare
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
force-pushed
the
mount-volsubpath
branch
from
1b7242a
to
edc09e6
Compare
This was referenced Mar 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
- What I did
volume-subpathoption to the long--mountformat.- How I did it
- How to verify it
TestMountSubvolume test (more tests in Moby)
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)