deep-stack/kompose
4
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #938 from hangyan/fix-helm-custom-dir

Browse Source 
Fix custom output and charts conflict error
This commit is contained in:
Charlie Drage
2018-02-27 10:07:39 -05:00
committed by GitHub
parent bccc56373c 0f3d368215
commit b365953266
2 changed files with 56 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/cmd/tests.sh
+4
View File
@@ -362,6 +362,10 @@ convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/script/test/fixture
# Behavior with -o <dirname>/<filename>
convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/script/test/fixtures/redis-example/docker-compose.yml convert -o $TEMP_DIR/output_file -j" "$TEMP_DIR/output_file"
######
# Test charts generate with custom dir
convert::check_artifacts_generated "kompose -f $KOMPOSE_ROOT/script/test/fixtures/redis-example/docker-compose.yml convert -o $TEMP_DIR -j -c" "$TEMP_DIR/Chart.yaml" "$TEMP_DIR/README.md" "$TEMP_DIR/templates/redis-deployment.json" "$TEMP_DIR/templates/redis-service.json" "$TEMP_DIR/templates/web-deployment.json" "$TEMP_DIR/templates/web-service.json"
####
# Test regarding build context (running kompose from various directories)
# Replacing variables with current branch and uri