Merge pull request #356 from cdrage/update-vendoring

Update vendoring as well as libcompose
This commit is contained in:
Charlie Drage
2017-01-12 12:49:14 -05:00
committed by GitHub
28 changed files with 649 additions and 433 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ source $KOMPOSE_ROOT/script/test/cmd/lib.sh
convert::expect_failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose.yml convert --stdout"
# commenting this test case out until image handling is fixed
#convert::expect_failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose-no-image.yml convert --stdout"
convert::expect_failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose-no-image.yml convert --stdout"
convert::expect_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/etherpad/docker-compose-no-ports.yml convert --stdout" "Service cannot be created because of missing port."
export $(cat $KOMPOSE_ROOT/script/test/fixtures/etherpad/envs)
# kubernetes test