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

Merge pull request #570 from procrypt/typo

Browse Source 
typo in nginx name.
This commit is contained in:
Charlie Drage 2017-04-25 12:40:44 -04:00 committed by GitHub
commit 60a637593c
11 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/test/cmd/tests.sh
View File

@ -41,11 +41,11 @@ convert::expect_success "kompose --provider=openshift -f $KOMPOSE_ROOT/script/te
unset $(cat $KOMPOSE_ROOT/script/test/fixtures/gitlab/envs | cut -d'=' -f1)
######
# Tests related to docker-compose file in /script/test/fixtures/ngnix-node-redis
# Tests related to docker-compose file in /script/test/fixtures/nginx-node-redis
# kubernetes test
convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-k8s.json" "Kubernetes provider doesn't support build key - ignoring"
convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/output-k8s.json" "Kubernetes provider doesn't support build key - ignoring"
# openshift test
convert::expect_success_and_warning "kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/ngnix-node-redis/output-os.json" "Buildconfig using https://github.com/kubernetes-incubator/kompose.git::HEAD as source."
convert::expect_success_and_warning "kompose --provider=openshift -f $KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/nginx-node-redis/output-os.json" "Buildconfig using https://github.com/kubernetes-incubator/kompose.git::HEAD as source."
######
# Tests related to docker-compose file in /script/test/fixtures/entrypoint-command

0
script/test/fixtures/ngnix-node-redis/README.md → script/test/fixtures/nginx-node-redis/README.md vendored
View File

0
script/test/fixtures/ngnix-node-redis/docker-compose.yml → script/test/fixtures/nginx-node-redis/docker-compose.yml vendored
View File

0
script/test/fixtures/ngnix-node-redis/nginx/Dockerfile → script/test/fixtures/nginx-node-redis/nginx/Dockerfile vendored
View File

0
script/test/fixtures/ngnix-node-redis/nginx/nginx.conf → script/test/fixtures/nginx-node-redis/nginx/nginx.conf vendored
View File

0
script/test/fixtures/ngnix-node-redis/node/Dockerfile → script/test/fixtures/nginx-node-redis/node/Dockerfile vendored
View File

0
script/test/fixtures/ngnix-node-redis/node/index.js → script/test/fixtures/nginx-node-redis/node/index.js vendored
View File

0
script/test/fixtures/ngnix-node-redis/node/package.json → script/test/fixtures/nginx-node-redis/node/package.json vendored
View File

0
script/test/fixtures/ngnix-node-redis/node/test/dummyTest.js → script/test/fixtures/nginx-node-redis/node/test/dummyTest.js vendored
View File

0
script/test/fixtures/ngnix-node-redis/output-k8s.json → script/test/fixtures/nginx-node-redis/output-k8s.json vendored
View File

8
script/test/fixtures/ngnix-node-redis/output-os.json → script/test/fixtures/nginx-node-redis/output-os.json vendored
View File

@ -234,7 +234,7 @@
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "HEAD"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
"contextDir": "script/test/fixtures/nginx-node-redis/node"
},
"strategy": {
"type": "Docker",
@ -355,7 +355,7 @@
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "HEAD"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
"contextDir": "script/test/fixtures/nginx-node-redis/node"
},
"strategy": {
"type": "Docker",
@ -476,7 +476,7 @@
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "HEAD"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/node"
"contextDir": "script/test/fixtures/nginx-node-redis/node"
},
"strategy": {
"type": "Docker",
@ -688,7 +688,7 @@
"uri": "https://github.com/kubernetes-incubator/kompose.git",
"ref": "HEAD"
},
"contextDir": "script/test/fixtures/ngnix-node-redis/nginx"
"contextDir": "script/test/fixtures/nginx-node-redis/nginx"
},
"strategy": {
"type": "Docker",