LaconicNetwork/kompose
7
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update created artifacts for k8s and openshift

Browse Source 
update created artifacts for kubernetes and openshift so that env variables are populated in a particular order
This commit is contained in:
Abhishek
2017-06-16 12:35:27 +05:30
parent f823a22e64
commit c8881f5aa4
6 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/etherpad/output-k8s.json
Vendored
+4 -4
View File
@@ -85,10 +85,6 @@
}
],
"env": [
{
"name": "DB_USER",
"value": "etherpad"
},
{
"name": "DB_DBID",
"value": "etherpad"
@@ -104,6 +100,10 @@
{
"name": "DB_PORT",
"value": "3306"
},
{
"name": "DB_USER",
"value": "etherpad"
}
],
"resources": {}
script/test/fixtures/gitlab/docker-compose.yml
Vendored
+1 -1
View File
@@ -30,4 +30,4 @@ services:
redis:
image: swordphilic/redis
ports:
- "$REDIS_PORT"
- $REDIS_PORT
script/test/fixtures/gitlab/output-k8s.json
Vendored
+8 -8
View File
@@ -127,10 +127,6 @@
}
],
"env": [
{
"name": "REDIS_PORT",
"value": "6379"
},
{
"name": "DB_HOST",
"value": "postgresql"
@@ -158,6 +154,10 @@
{
"name": "REDIS_HOST",
"value": "redis"
},
{
"name": "REDIS_PORT",
"value": "6379"
}
],
"resources": {}
@@ -200,10 +200,6 @@
}
],
"env": [
{
"name": "DB_USER",
"value": "gitlab"
},
{
"name": "DB_NAME",
"value": "gitlab"
@@ -211,6 +207,10 @@
{
"name": "DB_PASS",
"value": "gitlab"
},
{
"name": "DB_USER",
"value": "gitlab"
}
],
"resources": {}
script/test/fixtures/keyonly-envs/output-k8s.json
Vendored
+12 -12
View File
@@ -111,14 +111,6 @@
}
],
"env": [
{
"name": "SESSION_SECRET",
"value": "session"
},
{
"name": "SHOW",
"value": "true"
},
{
"name": "GET_HOSTS_FROM",
"value": "dns"
@@ -126,6 +118,14 @@
{
"name": "RACK_ENV",
"value": "development"
},
{
"name": "SESSION_SECRET",
"value": "session"
},
{
"name": "SHOW",
"value": "true"
}
],
"resources": {}
@@ -215,13 +215,13 @@
"name": "RACK_ENV",
"value": "development"
},
{
"name": "SHOW",
"value": "true"
},
{
"name": "SESSION_SECRET",
"value": "session"
},
{
"name": "SHOW",
"value": "true"
}
],
"resources": {}
script/test/fixtures/multiple-compose-files/output-k8s.json
Vendored
+8 -8
View File
@@ -176,14 +176,6 @@
}
],
"env": [
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "openshift"
},
{
"name": "MYSQL_USER",
"value": "openshift"
},
{
"name": "MYSQL_DATABASE",
"value": "openshift"
@@ -191,6 +183,14 @@
{
"name": "MYSQL_PASSWORD",
"value": "openshift"
},
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "openshift"
},
{
"name": "MYSQL_USER",
"value": "openshift"
}
],
"resources": {},
script/test/fixtures/multiple-compose-files/output-openshift.json
Vendored
+8 -8
View File
@@ -123,6 +123,10 @@
}
],
"env": [
{
"name": "DB_DBID",
"value": "openshift"
},
{
"name": "DB_HOST",
"value": "openshift"
@@ -138,10 +142,6 @@
{
"name": "DB_USER",
"value": "openshift"
},
{
"name": "DB_DBID",
"value": "openshift"
}
],
"resources": {}
@@ -254,10 +254,6 @@
}
],
"env": [
{
"name": "MYSQL_USER",
"value": "openshift"
},
{
"name": "MYSQL_DATABASE",
"value": "openshift"
@@ -269,6 +265,10 @@
{
"name": "MYSQL_ROOT_PASSWORD",
"value": "openshift"
},
{
"name": "MYSQL_USER",
"value": "openshift"
}
],
"resources": {},