vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1307 from giuseppe/addtl-mounts

Browse source 
system container: add $ADDTL_MOUNTS
This commit is contained in:
Antonio Murdaca 2018-02-08 16:31:56 +01:00 committed by GitHub
commit 0b26d6452d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/system_containers/centos/config.json.template
View file

@ -423,5 +423,6 @@
"source": "/proc", "source": "/proc",
"type": "proc" "type": "proc"
} }
$ADDTL_MOUNTS
] ]
} }

3
contrib/system_containers/centos/manifest.json
View file

@ -5,6 +5,7 @@
"OPT_CNI" : "/opt/cni", "OPT_CNI" : "/opt/cni",
"VAR_LIB_CONTAINERS_STORAGE" : "/var/lib/containers/storage", "VAR_LIB_CONTAINERS_STORAGE" : "/var/lib/containers/storage",
"VAR_LIB_ORIGIN" : "/var/lib/origin", "VAR_LIB_ORIGIN" : "/var/lib/origin",
"VAR_LIB_KUBE" : "/var/lib/kubelet" "VAR_LIB_KUBE" : "/var/lib/kubelet",
"ADDTL_MOUNTS" : ""
} }
} }

1
contrib/system_containers/fedora/config.json.template
View file

@ -428,5 +428,6 @@
"source": "/proc", "source": "/proc",
"type": "proc" "type": "proc"
} }
$ADDTL_MOUNTS
] ]
} }

3
contrib/system_containers/fedora/manifest.json
View file

@ -5,6 +5,7 @@
"OPT_CNI" : "/opt/cni", "OPT_CNI" : "/opt/cni",
"VAR_LIB_CONTAINERS_STORAGE" : "/var/lib/containers/storage", "VAR_LIB_CONTAINERS_STORAGE" : "/var/lib/containers/storage",
"VAR_LIB_ORIGIN" : "/var/lib/origin", "VAR_LIB_ORIGIN" : "/var/lib/origin",
"VAR_LIB_KUBE" : "/var/lib/kubelet" "VAR_LIB_KUBE" : "/var/lib/kubelet",
"ADDTL_MOUNTS" : ""
} }
} }

1
contrib/system_containers/rhel/config.json.template
View file

@ -418,5 +418,6 @@
"source": "/proc", "source": "/proc",
"type": "proc" "type": "proc"
} }
$ADDTL_MOUNTS
] ]
} }

3
contrib/system_containers/rhel/manifest.json
View file

@ -5,6 +5,7 @@
"OPT_CNI": "/opt/cni", "OPT_CNI": "/opt/cni",
"VAR_LIB_CONTAINERS_STORAGE": "/var/lib/containers/storage", "VAR_LIB_CONTAINERS_STORAGE": "/var/lib/containers/storage",
"VAR_LIB_ORIGIN": "/var/lib/origin", "VAR_LIB_ORIGIN": "/var/lib/origin",
"VAR_LIB_KUBE": "/var/lib/kubelet" "VAR_LIB_KUBE": "/var/lib/kubelet",
"ADDTL_MOUNTS" : ""
} }
} }