Skip to content

Instantly share code, notes, and snippets.

@shadeslayer

shadeslayer/check.diff

Created November 29, 2016 22:12
Show Gist options
  • Save shadeslayer/74c22ec1993a44a8e481549fe7ea486a to your computer and use it in GitHub Desktop.
Save shadeslayer/74c22ec1993a44a8e481549fe7ea486a to your computer and use it in GitHub Desktop.
Download ZIP
Raw
check.diff
--- /tmp/test 2016-11-29 22:10:52.969593000 +0000
+++ /tmp/new 2016-11-29 22:11:37.713593000 +0000
@@ -1,8 +1,8 @@
[
{
- "Id": "60ad534d471db44fbb8925afd7bd5e5b005283155e0a8a7a7dd0b28c38466062",
- "Created": "2016-11-29T22:10:40.727567126Z",
- "Path": "/var/lib/jenkins/ci-tooling/dci/imager.rb",
+ "Id": "6a42baf19f1d8d7b67aa380806ed332d27502e1a263c306c01a5418d3f374673",
+ "Created": "2016-11-29T22:11:16.240709659Z",
+ "Path": "bash",
"Args": [],
"State": {
"Status": "running",
@@ -11,18 +11,18 @@
"Restarting": false,
"OOMKilled": false,
"Dead": false,
- "Pid": 14054,
+ "Pid": 14356,
"ExitCode": 0,
"Error": "",
- "StartedAt": "2016-11-29T22:10:41.228584516Z",
+ "StartedAt": "2016-11-29T22:11:16.639452823Z",
"FinishedAt": "0001-01-01T00:00:00Z"
},
"Image": "sha256:04abe2ab6daace80acf9fffa72299ca20b872e5113130f6d1bd43a3636f74b8e",
- "ResolvConfPath": "/var/lib/docker/100000.120/containers/60ad534d471db44fbb8925afd7bd5e5b005283155e0a8a7a7dd0b28c38466062/resolv.conf",
- "HostnamePath": "/var/lib/docker/100000.120/containers/60ad534d471db44fbb8925afd7bd5e5b005283155e0a8a7a7dd0b28c38466062/hostname",
- "HostsPath": "/var/lib/docker/100000.120/containers/60ad534d471db44fbb8925afd7bd5e5b005283155e0a8a7a7dd0b28c38466062/hosts",
- "LogPath": "/var/lib/docker/100000.120/containers/60ad534d471db44fbb8925afd7bd5e5b005283155e0a8a7a7dd0b28c38466062/60ad534d471db44fbb8925afd7bd5e5b005283155e0a8a7a7dd0b28c38466062-json.log",
- "Name": "/jenkins-img_netrunner-core_stable_amd64-325",
+ "ResolvConfPath": "/var/lib/docker/100000.120/containers/6a42baf19f1d8d7b67aa380806ed332d27502e1a263c306c01a5418d3f374673/resolv.conf",
+ "HostnamePath": "/var/lib/docker/100000.120/containers/6a42baf19f1d8d7b67aa380806ed332d27502e1a263c306c01a5418d3f374673/hostname",
+ "HostsPath": "/var/lib/docker/100000.120/containers/6a42baf19f1d8d7b67aa380806ed332d27502e1a263c306c01a5418d3f374673/hosts",
+ "LogPath": "/var/lib/docker/100000.120/containers/6a42baf19f1d8d7b67aa380806ed332d27502e1a263c306c01a5418d3f374673/6a42baf19f1d8d7b67aa380806ed332d27502e1a263c306c01a5418d3f374673-json.log",
+ "Name": "/happy_raman",
"RestartCount": 0,
"Driver": "aufs",
"MountLabel": "",
@@ -30,18 +30,16 @@
"AppArmorProfile": "",
"ExecIDs": null,
"HostConfig": {
- "Binds": [
- "/var/lib/jenkins-slave/dci/workspace/img_netrunner-core_stable_amd64:/var/lib/jenkins-slave/dci/workspace/img_netrunner-core_stable_amd64"
- ],
+ "Binds": null,
"ContainerIDFile": "",
"LogConfig": {
"Type": "json-file",
"Config": {}
},
"NetworkMode": "default",
- "PortBindings": null,
+ "PortBindings": {},
"RestartPolicy": {
- "Name": "",
+ "Name": "no",
"MaximumRetryCount": 0
},
"AutoRemove": false,
@@ -49,9 +47,9 @@
"VolumesFrom": null,
"CapAdd": null,
"CapDrop": null,
- "Dns": null,
- "DnsOptions": null,
- "DnsSearch": null,
+ "Dns": [],
+ "DnsOptions": [],
+ "DnsSearch": [],
"ExtraHosts": null,
"GroupAdd": null,
"IpcMode": "",
@@ -87,7 +85,7 @@
"CpuQuota": 0,
"CpusetCpus": "",
"CpusetMems": "",
- "Devices": null,
+ "Devices": [],
"DiskQuota": 0,
"KernelMemory": 0,
"MemoryReservation": 0,
@@ -95,13 +93,7 @@
"MemorySwappiness": -1,
"OomKillDisable": false,
"PidsLimit": 0,
- "Ulimits": [
- {
- "Name": "nofile",
- "Hard": 1024,
- "Soft": 1024
- }
- ],
+ "Ulimits": null,
"CpuCount": 0,
"CpuPercent": 0,
"IOMaximumIOps": 0,
@@ -111,76 +103,60 @@
"Name": "aufs",
"Data": null
},
- "Mounts": [
- {
- "Source": "/var/lib/jenkins-slave/dci/workspace/img_netrunner-core_stable_amd64",
- "Destination": "/var/lib/jenkins-slave/dci/workspace/img_netrunner-core_stable_amd64",
- "Mode": "",
- "RW": true,
- "Propagation": "rprivate"
- }
- ],
+ "Mounts": [],
"Config": {
- "Hostname": "60ad534d471d",
+ "Hostname": "6a42baf19f1d",
"Domainname": "",
"User": "",
- "AttachStdin": false,
- "AttachStdout": false,
- "AttachStderr": false,
- "Tty": false,
- "OpenStdin": false,
- "StdinOnce": false,
- "Env": [
- "PATH=/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin",
- "LANG=en_US.UTF-8",
- "DEBIAN_FRONTEND=noninteractive ",
- "DIST=stable",
- "BUILD_NUMBER=325"
- ],
+ "AttachStdin": true,
+ "AttachStdout": true,
+ "AttachStderr": true,
+ "Tty": true,
+ "OpenStdin": true,
+ "StdinOnce": true,
+ "Env": null,
"Cmd": [
- "/var/lib/jenkins/ci-tooling/dci/imager.rb"
+ "bash"
],
"Image": "pangea/debian:stable",
- "Volumes": {
- "/var/lib/jenkins-slave/dci/workspace/img_netrunner-core_stable_amd64": {}
- },
- "WorkingDir": "/var/lib/jenkins-slave/dci/workspace/img_netrunner-core_stable_amd64",
+ "Volumes": null,
+ "WorkingDir": "",
"Entrypoint": null,
"OnBuild": null,
"Labels": {}
},
"NetworkSettings": {
"Bridge": "",
- "SandboxID": "7cc1d15636e4b07d0f84d159ad4758fcc8e50deba261b12575dd0e8dd7f5751c",
+ "SandboxID": "9873bf342d0ae311333cde1f4a291aac8230f6ea70835ecfe8d08164f53a96c7",
"HairpinMode": false,
"LinkLocalIPv6Address": "",
"LinkLocalIPv6PrefixLen": 0,
"Ports": {},
- "SandboxKey": "/var/run/docker/netns/7cc1d15636e4",
+ "SandboxKey": "/var/run/docker/netns/9873bf342d0a",
"SecondaryIPAddresses": null,
"SecondaryIPv6Addresses": null,
- "EndpointID": "ab8c3b71b05cb829af40ab94d834176dd2be1d2e3e7b018a4e928811e9a19fb1",
+ "EndpointID": "0e70d3cec68a07cbe9fa8ade9c2d9a2c3694a00447211f9852923e31396c2988",
"Gateway": "172.17.0.1",
"GlobalIPv6Address": "",
"GlobalIPv6PrefixLen": 0,
- "IPAddress": "172.17.0.2",
+ "IPAddress": "172.17.0.3",
"IPPrefixLen": 16,
"IPv6Gateway": "",
- "MacAddress": "02:42:ac:11:00:02",
+ "MacAddress": "02:42:ac:11:00:03",
"Networks": {
"bridge": {
"IPAMConfig": null,
"Links": null,
"Aliases": null,
"NetworkID": "0ad6bd3f844e543c8b2e6d8f8190310bb0f0dc97ab7995cd41b18cbd543197b1",
- "EndpointID": "ab8c3b71b05cb829af40ab94d834176dd2be1d2e3e7b018a4e928811e9a19fb1",
+ "EndpointID": "0e70d3cec68a07cbe9fa8ade9c2d9a2c3694a00447211f9852923e31396c2988",
"Gateway": "172.17.0.1",
- "IPAddress": "172.17.0.2",
+ "IPAddress": "172.17.0.3",
"IPPrefixLen": 16,
"IPv6Gateway": "",
"GlobalIPv6Address": "",
"GlobalIPv6PrefixLen": 0,
- "MacAddress": "02:42:ac:11:00:02"
+ "MacAddress": "02:42:ac:11:00:03"
}
}
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment