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

Support config short syntax and fix old bugs (#1230)

Browse Source
This commit is contained in:
Hang Yan
2020-01-05 10:19:22 +08:00
committed by GitHub
parent fe4301192a
commit 05e9bf4fc8
13 changed files with 209 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/merge-multiple-compose/output-other-toplevel-merge-template.json
Vendored
+24 -10
View File
@@ -14,7 +14,7 @@
}
},
"data": {
"first-config.txt": "First config\n"
"first_config.txt": "First config\n"
}
},
{
@@ -61,8 +61,9 @@
"resources": {},
"volumeMounts": [
{
"mountPath": "/nginx.conf",
"name": "firstconfig"
"mountPath": "/etc/nginx.conf",
"name": "firstconfig",
"subPath": "nginx.conf"
},
{
"mountPath": "/var/www/nginx",
@@ -76,8 +77,14 @@
"volumes": [
{
"configMap": {
"name": "firstconfig",
"defaultMode": 644
"defaultMode": 644,
"items": [
{
"key": "first_config.txt",
"path": "nginx.conf"
}
],
"name": "firstconfig"
},
"name": "firstconfig"
},
@@ -126,7 +133,7 @@
}
},
"data": {
"second-config.txt": "Second config\n"
"second_config.txt": "Second config\n"
}
},
{
@@ -173,8 +180,9 @@
"resources": {},
"volumeMounts": [
{
"mountPath": "/nginx.conf",
"name": "secondconfig"
"mountPath": "/etc/nginx.conf",
"name": "secondconfig",
"subPath": "nginx.conf"
},
{
"mountPath": "/var/www/nginx",
@@ -188,8 +196,14 @@
"volumes": [
{
"configMap": {
"name": "secondconfig",
"defaultMode": 644
"defaultMode": 644,
"items": [
{
"key": "second_config.txt",
"path": "nginx.conf"
}
],
"name": "secondconfig"
},
"name": "secondconfig"
},
script/test/fixtures/merge-multiple-compose/output-other-toplevel-override-template.json
Vendored
+12 -5
View File
@@ -14,7 +14,7 @@
}
},
"data": {
"second-config.txt": "Second config\n"
"second_config.txt": "Second config\n"
}
},
{
@@ -61,8 +61,9 @@
"resources": {},
"volumeMounts": [
{
"mountPath": "/nginx.conf",
"name": "firstconfig"
"mountPath": "/etc/nginx.conf",
"name": "firstconfig",
"subPath": "nginx.conf"
},
{
"mountPath": "/var/www/nginx",
@@ -76,8 +77,14 @@
"volumes": [
{
"configMap": {
"name": "firstconfig",
"defaultMode": 644
"defaultMode": 644,
"items": [
{
"key": "second_config.txt",
"path": "nginx.conf"
}
],
"name": "firstconfig"
},
"name": "firstconfig"
},