瀏覽代碼

runconfig: remove fixtures for api < v1.19

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 1 年之前
父節點
當前提交
d26bdfe226

+ 1 - 2
runconfig/config_test.go

@@ -26,11 +26,10 @@ func TestDecodeContainerConfig(t *testing.T) {
 		imgName  string
 		imgName  string
 	)
 	)
 
 
+	// FIXME (thaJeztah): update fixtures for more current versions.
 	if runtime.GOOS != "windows" {
 	if runtime.GOOS != "windows" {
 		imgName = "ubuntu"
 		imgName = "ubuntu"
 		fixtures = []f{
 		fixtures = []f{
-			{"fixtures/unix/container_config_1_14.json", strslice.StrSlice{}},
-			{"fixtures/unix/container_config_1_17.json", strslice.StrSlice{"bash"}},
 			{"fixtures/unix/container_config_1_19.json", strslice.StrSlice{"bash"}},
 			{"fixtures/unix/container_config_1_19.json", strslice.StrSlice{"bash"}},
 		}
 		}
 	} else {
 	} else {

+ 0 - 30
runconfig/fixtures/unix/container_config_1_14.json

@@ -1,30 +0,0 @@
-{
-     "Hostname":"",
-     "Domainname": "",
-     "User":"",
-     "Memory": 1000,
-     "MemorySwap":0,
-     "CpuShares": 512,
-     "Cpuset": "0,1",
-     "AttachStdin":false,
-     "AttachStdout":true,
-     "AttachStderr":true,
-     "PortSpecs":null,
-     "Tty":false,
-     "OpenStdin":false,
-     "StdinOnce":false,
-     "Env":null,
-     "Cmd":[
-             "bash"
-     ],
-     "Image":"ubuntu",
-     "Volumes":{
-             "/tmp": {}
-     },
-     "WorkingDir":"",
-     "NetworkDisabled": false,
-     "ExposedPorts":{
-             "22/tcp": {}
-     },
-     "RestartPolicy": { "Name": "always" }
-}

+ 0 - 50
runconfig/fixtures/unix/container_config_1_17.json

@@ -1,50 +0,0 @@
-{
-     "Hostname": "",
-     "Domainname": "",
-     "User": "",
-     "Memory": 1000,
-     "MemorySwap": 0,
-     "CpuShares": 512,
-     "Cpuset": "0,1",
-     "AttachStdin": false,
-     "AttachStdout": true,
-     "AttachStderr": true,
-     "Tty": false,
-     "OpenStdin": false,
-     "StdinOnce": false,
-     "Env": null,
-     "Cmd": [
-             "date"
-     ],
-     "Entrypoint": "bash",
-     "Image": "ubuntu",
-     "Volumes": {
-             "/tmp": {}
-     },
-     "WorkingDir": "",
-     "NetworkDisabled": false,
-     "MacAddress": "12:34:56:78:9a:bc",
-     "ExposedPorts": {
-             "22/tcp": {}
-     },
-     "SecurityOpt": [""],
-     "HostConfig": {
-       "Binds": ["/tmp:/tmp"],
-       "Links": ["redis3:redis"],
-       "LxcConf": {"lxc.utsname":"docker"},
-       "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-       "PublishAllPorts": false,
-       "Privileged": false,
-       "ReadonlyRootfs": false,
-       "Dns": ["8.8.8.8"],
-       "DnsSearch": [""],
-       "DnsOptions": [""],
-       "ExtraHosts": null,
-       "VolumesFrom": ["parent", "other:ro"],
-       "CapAdd": ["NET_ADMIN"],
-       "CapDrop": ["MKNOD"],
-       "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-       "NetworkMode": "bridge",
-       "Devices": []
-    }
-}