Merge pull request #873 from po3rin/rm-useless-spaces

rm useless spaces
docker-19.03
Tõnis Tiigi 2019-03-14 17:41:06 -07:00 committed by GitHub
commit a642101687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -12,10 +12,10 @@ if [ "$CONTINUOUS_INTEGRATION" == "true" ]; then progressFlag="--progress=plain"
binariesLegacy() {
mkdir -p bin
iidfile=$(mktemp -t docker-iidfile.XXXXXXXXXX)
copysrc="/usr/bin/."
case "$(echo "$TARGETPLATFORM" | cut -d"/" -f1)" in
"darwin")
docker build --iidfile $iidfile --target buildctl-darwin -f ./hack/dockerfiles/test.Dockerfile --force-rm .
@ -29,7 +29,7 @@ binariesLegacy() {
docker build --iidfile $iidfile --target buildkit-binaries -f ./hack/dockerfiles/test.Dockerfile --force-rm .
;;
esac
iid=$(cat $iidfile)
containerID=$(docker create $iid copy)
docker cp $containerID:$copysrc bin

View File

@ -78,8 +78,8 @@ if [ "$TEST_DOCKERFILE" == 1 ]; then
if [ -z $DOCKERFILE_RELEASES ]; then
DOCKERFILE_RELEASES="mainline experimental mounts secrets ssh"
fi
for release in $DOCKERFILE_RELEASES; do
buildtags=$(cat ./frontend/dockerfile/release/$release/tags)
tarout=$(mktemp -t dockerfile-frontend.XXXXXXXXXX)