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

Fix missing attribute when convert with multiple docker-compose files

Browse Source 
Signed-off-by: xianlubird <xianlubird@gmail.com>
This commit is contained in:
xianlubird
2018-05-03 11:51:55 +08:00
parent 28031a9453
commit 04e9ee9949
11 changed files with 760 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/test/fixtures/merge-multiple-compose/base.yml
Vendored
+12
View File
@@ -0,0 +1,12 @@
version: '3'
services:
web:
image: richarvey/nginx-php-fpm
environment:
- ERRORS=0
- HIDE_NGINX_HEADERS=0
- REMOVE_FILES=0
- RUN_SCRIPTS=0
- PHP_ERRORS_STDERR=0
- ENABLE_XDEBUG=0
script/test/fixtures/merge-multiple-compose/compose-new-service-prob.yml
Vendored
+8
View File
@@ -0,0 +1,8 @@
version: '3'
services:
server:
ports:
- 5000:5000
new-my-service:
image: nginx
script/test/fixtures/merge-multiple-compose/compose-port-base.yml
Vendored
+11
View File
@@ -0,0 +1,11 @@
version: '3'
services:
server:
image: test
container_name: test_server
build:
context: .
dockerfile: Dockerfile-dev
ports:
- 3000:3000
script/test/fixtures/merge-multiple-compose/compose-port-prod.yml
Vendored
+6
View File
@@ -0,0 +1,6 @@
version: '3'
services:
server:
ports:
- 5000:5000
script/test/fixtures/merge-multiple-compose/dev.yml
Vendored
+11
View File
@@ -0,0 +1,11 @@
version: '3'
services:
web:
environment:
- ERRORS=1
- HIDE_NGINX_HEADERS=0
- REMOVE_FILES=0
- RUN_SCRIPTS=1
- PHP_ERRORS_STDERR=1
- ENABLE_XDEBUG=1
script/test/fixtures/merge-multiple-compose/output-base-template.json
Vendored
+71
View File
@@ -0,0 +1,71 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "web",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "web"
}
},
"spec": {
"containers": [
{
"name": "web",
"image": "richarvey/nginx-php-fpm",
"env": [
{
"name": "ENABLE_XDEBUG",
"value": "1"
},
{
"name": "ERRORS",
"value": "1"
},
{
"name": "HIDE_NGINX_HEADERS",
"value": "0"
},
{
"name": "PHP_ERRORS_STDERR",
"value": "1"
},
{
"name": "REMOVE_FILES",
"value": "0"
},
{
"name": "RUN_SCRIPTS",
"value": "1"
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
},
"strategy": {}
},
"status": {}
}
]
}
script/test/fixtures/merge-multiple-compose/output-compose-new-service-template.json
Vendored
+118
View File
@@ -0,0 +1,118 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "server",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"ports": [
{
"name": "5000",
"port": 5000,
"targetPort": 5000
}
],
"selector": {
"io.kompose.service": "server"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "new-my-service",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
}
},
"spec": {
"containers": [
{
"name": "new-my-service",
"image": "nginx",
"resources": {}
}
],
"restartPolicy": "Always"
}
},
"strategy": {}
},
"status": {}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "server",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
}
},
"spec": {
"containers": [
{
"name": "test_server",
"image": "test",
"ports": [
{
"containerPort": 5000
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
},
"strategy": {}
},
"status": {}
}
]
}
script/test/fixtures/merge-multiple-compose/output-compose-port-template.json
Vendored
+80
View File
@@ -0,0 +1,80 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "server",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"ports": [
{
"name": "5000",
"port": 5000,
"targetPort": 5000
}
],
"selector": {
"io.kompose.service": "server"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "Deployment",
"apiVersion": "extensions/v1beta1",
"metadata": {
"name": "server",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"replicas": 1,
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
}
},
"spec": {
"containers": [
{
"name": "test_server",
"image": "test",
"ports": [
{
"containerPort": 5000
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
},
"strategy": {}
},
"status": {}
}
]
}
script/test/fixtures/merge-multiple-compose/output-openshift-template.json
Vendored
+222
View File
@@ -0,0 +1,222 @@
{
"kind": "List",
"apiVersion": "v1",
"metadata": {},
"items": [
{
"kind": "Service",
"apiVersion": "v1",
"metadata": {
"name": "server",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"ports": [
{
"name": "5000",
"port": 5000,
"targetPort": 5000
}
],
"selector": {
"io.kompose.service": "server"
}
},
"status": {
"loadBalancer": {}
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "new-my-service",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"new-my-service"
],
"from": {
"kind": "ImageStreamTag",
"name": "new-my-service:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "new-my-service"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
}
},
"spec": {
"containers": [
{
"name": "new-my-service",
"image": " ",
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "new-my-service",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "new-my-service"
}
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "nginx"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": {
"dockerImageRepository": ""
}
},
{
"kind": "DeploymentConfig",
"apiVersion": "v1",
"metadata": {
"name": "server",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
},
"annotations": {
"kompose.cmd": "%CMD%",
"kompose.version": "%VERSION%"
}
},
"spec": {
"strategy": {
"resources": {}
},
"triggers": [
{
"type": "ConfigChange"
},
{
"type": "ImageChange",
"imageChangeParams": {
"automatic": true,
"containerNames": [
"test_server"
],
"from": {
"kind": "ImageStreamTag",
"name": "server:latest"
}
}
}
],
"replicas": 1,
"test": false,
"selector": {
"io.kompose.service": "server"
},
"template": {
"metadata": {
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
}
},
"spec": {
"containers": [
{
"name": "test_server",
"image": " ",
"ports": [
{
"containerPort": 5000
}
],
"resources": {}
}
],
"restartPolicy": "Always"
}
}
},
"status": {}
},
{
"kind": "ImageStream",
"apiVersion": "v1",
"metadata": {
"name": "server",
"creationTimestamp": null,
"labels": {
"io.kompose.service": "server"
}
},
"spec": {
"tags": [
{
"name": "latest",
"annotations": null,
"from": {
"kind": "DockerImage",
"name": "test"
},
"generation": null,
"importPolicy": {}
}
]
},
"status": {
"dockerImageRepository": ""
}
}
]
}