mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Windows CI: Setup for testing against Windows
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
parent
1a7d40c692
commit
a4b77dc1af
3 changed files with 36 additions and 6 deletions
|
@ -30,7 +30,7 @@ fi
|
||||||
if ! docker inspect "${images[@]}" &> /dev/null; then
|
if ! docker inspect "${images[@]}" &> /dev/null; then
|
||||||
hardCodedDir='/docker-frozen-images'
|
hardCodedDir='/docker-frozen-images'
|
||||||
if [ -d "$hardCodedDir" ]; then
|
if [ -d "$hardCodedDir" ]; then
|
||||||
# Do not use a subshell for the following command. Windows CI
|
# Do not use a subshell for the following command. Windows to Linux CI
|
||||||
# runs bash 3.x so will not trap an error in a subshell.
|
# runs bash 3.x so will not trap an error in a subshell.
|
||||||
# http://stackoverflow.com/questions/22630363/how-does-set-e-work-with-subshells
|
# http://stackoverflow.com/questions/22630363/how-does-set-e-work-with-subshells
|
||||||
set -x; tar -cC "$hardCodedDir" . | docker load; set +x
|
set -x; tar -cC "$hardCodedDir" . | docker load; set +x
|
||||||
|
@ -55,7 +55,7 @@ if ! docker inspect "${images[@]}" &> /dev/null; then
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
' "${DOCKERFILE:=Dockerfile}" | sh -x
|
' "${DOCKERFILE:=Dockerfile}" | sh -x
|
||||||
# Do not use a subshell for the following command. Windows CI
|
# Do not use a subshell for the following command. Windows to Linux CI
|
||||||
# runs bash 3.x so will not trap an error in a subshell.
|
# runs bash 3.x so will not trap an error in a subshell.
|
||||||
# http://stackoverflow.com/questions/22630363/how-does-set-e-work-with-subshells
|
# http://stackoverflow.com/questions/22630363/how-does-set-e-work-with-subshells
|
||||||
set -x; tar -cC "$dir" . | docker load; set +x
|
set -x; tar -cC "$dir" . | docker load; set +x
|
||||||
|
|
25
hack/make/.ensure-frozen-images-windows
Normal file
25
hack/make/.ensure-frozen-images-windows
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# This scripts sets up the required images for Windows to Windows CI
|
||||||
|
|
||||||
|
# Tag windowsservercore as latest
|
||||||
|
set +e
|
||||||
|
! BUILD=$(docker images | grep windowsservercore | grep -v latest | awk '{print $2}')
|
||||||
|
if [ -z $BUILD ]; then
|
||||||
|
echo "ERROR: Could not find windowsservercore images"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
! LATESTCOUNT=$(docker images | grep windowsservercore | grep -v $BUILD | wc -l)
|
||||||
|
if [ $LATESTCOUNT -ne 1 ]; then
|
||||||
|
set -e
|
||||||
|
docker tag windowsservercore:$BUILD windowsservercore:latest
|
||||||
|
echo "INFO: Tagged windowsservercore:$BUILD with latest"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Busybox (requires windowsservercore)
|
||||||
|
if [ -z "$(docker images | grep busybox)" ]; then
|
||||||
|
echo "INFO: Building busybox"
|
||||||
|
docker build -t busybox https://raw.githubusercontent.com/jhowardmsft/busybox/master/Dockerfile
|
||||||
|
fi
|
|
@ -2,7 +2,12 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
bundle .detect-daemon-osarch
|
bundle .detect-daemon-osarch
|
||||||
bundle .ensure-emptyfs
|
if [ $DOCKER_ENGINE_GOOS != "windows" ]; then
|
||||||
bundle .ensure-frozen-images
|
bundle .ensure-emptyfs
|
||||||
bundle .ensure-httpserver
|
bundle .ensure-frozen-images
|
||||||
bundle .ensure-syscall-test
|
bundle .ensure-httpserver
|
||||||
|
bundle .ensure-syscall-test
|
||||||
|
else
|
||||||
|
# Note this is Windows to Windows CI, not Windows to Linux CI
|
||||||
|
bundle .ensure-frozen-images-windows
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in a new issue