github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8524 from gabriel-samfira/update-volume-copy-up

Browse Source 
Update volume-copy-up
This commit is contained in:
Derek McGowan 2023-05-17 09:28:40 -07:00 committed by GitHub
commit 44eb8f3466
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
integration/images/volume-copy-up/Dockerfile
View File

@ -16,4 +16,19 @@ ARG BASE
FROM $BASE
RUN sh -c "mkdir /test_dir; echo test_content > /test_dir/test_file"
VOLUME "/test_dir"
RUN sh -c "mkdir -p /C:/weird_test_dir; echo test_content > /C:/weird_test_dir/weird_test_file"
RUN sh -c "mkdir /:colon_prefixed; echo test_content > /:colon_prefixed/colon_prefixed_file"
# We add a Windows style path here to ensure that for Linux, we don't mangle it in any way.
# The C: drive letter gets special treatment on Windows and is stripped by WithVolumes(). The remaining
# path is used to join with the volume mount point on the host. Colons are not allowed
# in Windows paths except when delimiting the drive letter, but on Linux such paths are
# perfectly valid and we must ensure we don't mutate them by accident.
#
# The C:/weird_test_dir volume is considered relative to "/" and will result in a mount point
# situated at /C:/weird_test_dir.
#
# The "/:colon_prefixed" volume is meant to test that we don't ignore copying existing contents
# to a volume containing a colon as the second character in the path on Linux, considering that
# on Windows, we skip this operation for any non-C volume defined here.
VOLUME ["/test_dir", "C:/weird_test_dir", "/:colon_prefixed"]

8
integration/images/volume-copy-up/Dockerfile_windows
View File

@ -34,4 +34,10 @@ RUN mkdir C:\test_dir && \
/bin/sh.exe -c "echo test_content > /test_dir/test_file"
ENV PATH="C:\bin;C:\Windows\System32;C:\Windows;"
VOLUME "C:/test_dir"
# Add an extra volume under D: to test that WithVoumes() doesn't err out when dealing with
# a non-C volume in WCOW.
#
# See:
# https://github.com/containerd/containerd/issues/8171
VOLUME ["C:/test_dir", "D:"]

2
integration/images/volume-copy-up/Makefile
View File

@ -15,7 +15,7 @@
all: build
PROJ=ghcr.io/containerd
VERSION=2.1
VERSION=2.2
IMAGE=$(PROJ)/volume-copy-up:$(VERSION)
DOCKER_CERT_PATH ?= "$(HOME)/.docker"
REMOTE_DOCKER_URL ?=