テキスト比較

2 つのテキスト ファイルの違いを見つける

ライブエディター
空白の変更を非表示
未変更行を折りたたむ
折り返しなし
レイアウト
比較精度
テキストスタイル
シンタックスハイライト

Untitled diff

作成日 差分は期限切れになりません
43 削除
290 行
40 追加
289 行
[
[
{
{
"Id": "b3f184e28153103717e5ac4965bb4da54581d7b140f407de19339d9ea4265a32",
"Id": "59f4b5f03b315e0cf5214769eff133067d4b18b93f2ba61e444ecc1825f7d138",
"Created": "2019-06-25T22:03:27.749707898Z",
"Created": "2019-06-27T16:48:58.938471668Z",
"Path": "/init",
"Path": "/init",
"Args": [],
"Args": [],
"State": {
"State": {
"Status": "running",
"Status": "running",
"Running": true,
"Running": true,
"Paused": false,
"Paused": false,
"Restarting": false,
"Restarting": false,
"OOMKilled": false,
"OOMKilled": false,
"Dead": false,
"Dead": false,
"Pid": 21273,
"Pid": 23833,
"ExitCode": 0,
"ExitCode": 0,
"Error": "",
"Error": "",
"StartedAt": "2019-06-25T22:03:28.53382673Z",
"StartedAt": "2019-06-27T16:49:00.049595365Z",
"FinishedAt": "0001-01-01T00:00:00Z"
"FinishedAt": "0001-01-01T00:00:00Z"
},
},
"Image": "sha256:eeb76ec12d58cb9edecb75fadb871d6ad88267a387893d699b2922b1901306d9",
"Image": "sha256:eeb76ec12d58cb9edecb75fadb871d6ad88267a387893d699b2922b1901306d9",
"ResolvConfPath": "/var/lib/docker/containers/b3f184e28153103717e5ac4965bb4da54581d7b140f407de19339d9ea4265a32/resolv.conf",
"ResolvConfPath": "/var/lib/docker/containers/59f4b5f03b315e0cf5214769eff133067d4b18b93f2ba61e444ecc1825f7d138/resolv.conf",
"HostnamePath": "/var/lib/docker/containers/b3f184e28153103717e5ac4965bb4da54581d7b140f407de19339d9ea4265a32/hostname",
"HostnamePath": "/var/lib/docker/containers/59f4b5f03b315e0cf5214769eff133067d4b18b93f2ba61e444ecc1825f7d138/hostname",
"HostsPath": "/var/lib/docker/containers/b3f184e28153103717e5ac4965bb4da54581d7b140f407de19339d9ea4265a32/hosts",
"HostsPath": "/var/lib/docker/containers/59f4b5f03b315e0cf5214769eff133067d4b18b93f2ba61e444ecc1825f7d138/hosts",
"LogPath": "/var/lib/docker/containers/b3f184e28153103717e5ac4965bb4da54581d7b140f407de19339d9ea4265a32/b3f184e28153103717e5ac4965bb4da54581d7b140f407de19339d9ea4265a32-json.log",
"LogPath": "/var/lib/docker/containers/59f4b5f03b315e0cf5214769eff133067d4b18b93f2ba61e444ecc1825f7d138/59f4b5f03b315e0cf5214769eff133067d4b18b93f2ba61e444ecc1825f7d138-json.log",
"Name": "/sonarr",
"Name": "/sonarr",
"RestartCount": 0,
"RestartCount": 0,
"Driver": "overlay2",
"Driver": "overlay2",
"Platform": "linux",
"Platform": "linux",
"MountLabel": "",
"MountLabel": "",
"ProcessLabel": "",
"ProcessLabel": "",
"AppArmorProfile": "docker-default",
"AppArmorProfile": "docker-default",
"ExecIDs": null,
"ExecIDs": null,
"HostConfig": {
"HostConfig": {
"Binds": [
"Binds": [
Text moved to lines 36-38
"/mnt/storage/shows:/tv:rw",
"/home/kevin/appdata/sonarr:/config:rw",
"/mnt/disk1/downloads_complete:/downloads_complete:rw",
"/home/kevin/appdata/sma/autoProcess.ini:/usr/local/bin/sma/sickbeard_mp4_automator/autoProcess.ini:rw",
"/home/kevin/appdata/sma/autoProcess.ini:/usr/local/bin/sma/sickbeard_mp4_automator/autoProcess.ini:rw",
Text moved from lines 35-37
"/mnt/disk1/downloads_complete:/downloads_complete:rw",
"/home/kevin/appdata/sonarr:/config:rw",
"/mnt/storage/shows:/tv:rw",
"a976a66620092d802cfce087fbe2b6a3af5865b0760fe92818d98ee965d74662:/downloads:rw"
"a976a66620092d802cfce087fbe2b6a3af5865b0760fe92818d98ee965d74662:/downloads:rw"
],
],
"ContainerIDFile": "",
"ContainerIDFile": "",
"LogConfig": {
"LogConfig": {
"Type": "json-file",
"Type": "json-file",
"Config": {}
"Config": {}
},
},
"NetworkMode": "opt_default",
"NetworkMode": "opt_default",
"PortBindings": {
"PortBindings": {
"8989/tcp": [
"8989/tcp": [
{
{
"HostIp": "",
"HostIp": "",
"HostPort": "8989"
"HostPort": "8989"
}
}
]
]
},
},
"RestartPolicy": {
"RestartPolicy": {
"Name": "unless-stopped",
"Name": "unless-stopped",
"MaximumRetryCount": 0
"MaximumRetryCount": 0
},
},
"AutoRemove": false,
"AutoRemove": false,
"VolumeDriver": "",
"VolumeDriver": "",
"VolumesFrom": [],
"VolumesFrom": [],
"CapAdd": null,
"CapAdd": null,
"CapDrop": null,
"CapDrop": null,
"Dns": [],
"Dns": null,
"DnsOptions": [],
"DnsOptions": null,
"DnsSearch": [],
"DnsSearch": null,
"ExtraHosts": null,
"ExtraHosts": null,
"GroupAdd": null,
"GroupAdd": null,
"IpcMode": "shareable",
"IpcMode": "shareable",
"Cgroup": "",
"Cgroup": "",
"Links": null,
"Links": null,
"OomScoreAdj": 0,
"OomScoreAdj": 0,
"PidMode": "",
"PidMode": "",
"Privileged": false,
"Privileged": false,
"PublishAllPorts": false,
"PublishAllPorts": false,
"ReadonlyRootfs": false,
"ReadonlyRootfs": false,
"SecurityOpt": null,
"SecurityOpt": null,
"UTSMode": "",
"UTSMode": "",
"UsernsMode": "",
"UsernsMode": "",
"ShmSize": 67108864,
"ShmSize": 67108864,
"Runtime": "runc",
"Runtime": "runc",
"ConsoleSize": [
"ConsoleSize": [
0,
0,
0
0
],
],
"Isolation": "",
"Isolation": "",
"CpuShares": 0,
"CpuShares": 0,
"Memory": 0,
"Memory": 0,
"NanoCpus": 0,
"NanoCpus": 0,
"CgroupParent": "",
"CgroupParent": "",
"BlkioWeight": 0,
"BlkioWeight": 0,
"BlkioWeightDevice": null,
"BlkioWeightDevice": null,
"BlkioDeviceReadBps": null,
"BlkioDeviceReadBps": null,
"BlkioDeviceWriteBps": null,
"BlkioDeviceWriteBps": null,
"BlkioDeviceReadIOps": null,
"BlkioDeviceReadIOps": null,
"BlkioDeviceWriteIOps": null,
"BlkioDeviceWriteIOps": null,
"CpuPeriod": 0,
"CpuPeriod": 0,
"CpuQuota": 0,
"CpuQuota": 0,
"CpuRealtimePeriod": 0,
"CpuRealtimePeriod": 0,
"CpuRealtimeRuntime": 0,
"CpuRealtimeRuntime": 0,
"CpusetCpus": "",
"CpusetCpus": "",
"CpusetMems": "",
"CpusetMems": "",
"Devices": null,
"Devices": null,
"DeviceCgroupRules": null,
"DeviceCgroupRules": null,
"DiskQuota": 0,
"DiskQuota": 0,
"KernelMemory": 0,
"KernelMemory": 0,
"MemoryReservation": 0,
"MemoryReservation": 0,
"MemorySwap": 0,
"MemorySwap": 0,
"MemorySwappiness": null,
"MemorySwappiness": null,
"OomKillDisable": false,
"OomKillDisable": false,
"PidsLimit": 0,
"PidsLimit": 0,
"Ulimits": null,
"Ulimits": null,
"CpuCount": 0,
"CpuCount": 0,
"CpuPercent": 0,
"CpuPercent": 0,
"IOMaximumIOps": 0,
"IOMaximumIOps": 0,
"IOMaximumBandwidth": 0,
"IOMaximumBandwidth": 0,
"MaskedPaths": [
"MaskedPaths": [
"/proc/asound",
"/proc/asound",
"/proc/acpi",
"/proc/acpi",
"/proc/kcore",
"/proc/kcore",
"/proc/keys",
"/proc/keys",
"/proc/latency_stats",
"/proc/latency_stats",
"/proc/timer_list",
"/proc/timer_list",
"/proc/timer_stats",
"/proc/timer_stats",
"/proc/sched_debug",
"/proc/sched_debug",
"/proc/scsi",
"/proc/scsi",
"/sys/firmware"
"/sys/firmware"
],
],
"ReadonlyPaths": [
"ReadonlyPaths": [
"/proc/bus",
"/proc/bus",
"/proc/fs",
"/proc/fs",
"/proc/irq",
"/proc/irq",
"/proc/sys",
"/proc/sys",
"/proc/sysrq-trigger"
"/proc/sysrq-trigger"
]
]
},
},
"GraphDriver": {
"GraphDriver": {
"Data": {
"Data": {
"LowerDir": "/var/lib/docker/overlay2/b32e7ed72a017e20b1eeeb2fe2aa78934508a0fed2d25c1ca475f93a026ce0ec-init/diff:/var/lib/docker/overlay2/cc0313d0eeea8ab58b66ceb461c09797b32faa2a7e9d0020c3c7a543093b472a/diff:/var/lib/docker/overlay2/e4e11339c9c801856e84abe9190d7be2c182f807a0ae0697f059427869ed4242/diff:/var/lib/docker/overlay2/1b8a8273344cd1db7e71ca51622598373697706be0bd977647c692843ffa2751/diff:/var/lib/docker/overlay2/585af92793c2e772e3d60983fd531f45ed8777a61a4ff1306ddb332d153a8322/diff:/var/lib/docker/overlay2/49719c13d64ecfc02d093c7973883039efb76e31b85b1e71d6ce8af096edfffe/diff:/var/lib/docker/overlay2/08f67d4aa9c44322b1c7cc47f8f65222ce8172cefe9c810db39a143d2253b5e8/diff:/var/lib/docker/overlay2/4e693eb8eb1d3ff4697b3c5830b1e4871f9c4a4018ec99e4a503eedcd61c9b33/diff:/var/lib/docker/overlay2/cf20276ed19898b95a2a42275415f76ae56b3988e071860e05f549da90758015/diff",
"LowerDir": "/var/lib/docker/overlay2/b11d9c42240757ea4ca7d61b2911141b61e7277ac2ee8b89c8d911f820931266-init/diff:/var/lib/docker/overlay2/cc0313d0eeea8ab58b66ceb461c09797b32faa2a7e9d0020c3c7a543093b472a/diff:/var/lib/docker/overlay2/e4e11339c9c801856e84abe9190d7be2c182f807a0ae0697f059427869ed4242/diff:/var/lib/docker/overlay2/1b8a8273344cd1db7e71ca51622598373697706be0bd977647c692843ffa2751/diff:/var/lib/docker/overlay2/585af92793c2e772e3d60983fd531f45ed8777a61a4ff1306ddb332d153a8322/diff:/var/lib/docker/overlay2/49719c13d64ecfc02d093c7973883039efb76e31b85b1e71d6ce8af096edfffe/diff:/var/lib/docker/overlay2/08f67d4aa9c44322b1c7cc47f8f65222ce8172cefe9c810db39a143d2253b5e8/diff:/var/lib/docker/overlay2/4e693eb8eb1d3ff4697b3c5830b1e4871f9c4a4018ec99e4a503eedcd61c9b33/diff:/var/lib/docker/overlay2/cf20276ed19898b95a2a42275415f76ae56b3988e071860e05f549da90758015/diff",
"MergedDir": "/var/lib/docker/overlay2/b32e7ed72a017e20b1eeeb2fe2aa78934508a0fed2d25c1ca475f93a026ce0ec/merged",
"MergedDir": "/var/lib/docker/overlay2/b11d9c42240757ea4ca7d61b2911141b61e7277ac2ee8b89c8d911f820931266/merged",
"UpperDir": "/var/lib/docker/overlay2/b32e7ed72a017e20b1eeeb2fe2aa78934508a0fed2d25c1ca475f93a026ce0ec/diff",
"UpperDir": "/var/lib/docker/overlay2/b11d9c42240757ea4ca7d61b2911141b61e7277ac2ee8b89c8d911f820931266/diff",
"WorkDir": "/var/lib/docker/overlay2/b32e7ed72a017e20b1eeeb2fe2aa78934508a0fed2d25c1ca475f93a026ce0ec/work"
"WorkDir": "/var/lib/docker/overlay2/b11d9c42240757ea4ca7d61b2911141b61e7277ac2ee8b89c8d911f820931266/work"
},
},
"Name": "overlay2"
"Name": "overlay2"
},
},
"Mounts": [
"Mounts": [
{
{
"Type": "bind",
"Type": "bind",
Text moved with changes to lines 165-174 (95.1% similarity)
"Source": "/mnt/storage/shows",
"Source": "/home/kevin/appdata/sma/autoProcess.ini",
"Destination": "/tv",
"Destination": "/usr/local/bin/sma/sickbeard_mp4_automator/autoProcess.ini",
"Mode": "rw",
"RW": true,
"Propagation": "rprivate"
},
{
"Type": "bind",
"Source": "/home/kevin/appdata/sonarr",
"Destination": "/config",
"Mode": "rw",
"Mode": "rw",
"RW": true,
"RW": true,
"Propagation": "rprivate"
"Propagation": "rprivate"
},
},
{
{
"Type": "bind",
"Type": "bind",
"Source": "/mnt/disk1/downloads_complete",
"Source": "/mnt/disk1/downloads_complete",
"Destination": "/downloads_complete",
"Destination": "/downloads_complete",
"Mode": "rw",
"Mode": "rw",
"RW": true,
"RW": true,
"Propagation": "rprivate"
"Propagation": "rprivate"
},
},
{
{
"Type": "bind",
"Type": "bind",
Text moved with changes from lines 149-158 (95.1% similarity)
"Source": "/home/kevin/appdata/sma/autoProcess.ini",
"Source": "/home/kevin/appdata/sonarr",
"Destination": "/usr/local/bin/sma/sickbeard_mp4_automator/autoProcess.ini",
"Destination": "/config",
"Mode": "rw",
"RW": true,
"Propagation": "rprivate"
},
{
"Type": "bind",
"Source": "/mnt/storage/shows",
"Destination": "/tv",
"Mode": "rw",
"Mode": "rw",
"RW": true,
"RW": true,
"Propagation": "rprivate"
"Propagation": "rprivate"
},
},
{
{
"Type": "volume",
"Type": "volume",
"Name": "a976a66620092d802cfce087fbe2b6a3af5865b0760fe92818d98ee965d74662",
"Name": "a976a66620092d802cfce087fbe2b6a3af5865b0760fe92818d98ee965d74662",
"Source": "/var/lib/docker/volumes/a976a66620092d802cfce087fbe2b6a3af5865b0760fe92818d98ee965d74662/_data",
"Source": "/var/lib/docker/volumes/a976a66620092d802cfce087fbe2b6a3af5865b0760fe92818d98ee965d74662/_data",
"Destination": "/downloads",
"Destination": "/downloads",
"Driver": "local",
"Driver": "local",
"Mode": "rw",
"Mode": "rw",
"RW": true,
"RW": true,
"Propagation": ""
"Propagation": ""
}
}
],
],
"Config": {
"Config": {
"Hostname": "0d24aff995a3",
"Hostname": "59f4b5f03b31",
"Domainname": "",
"Domainname": "",
"User": "",
"User": "",
"AttachStdin": false,
"AttachStdin": false,
"AttachStdout": false,
"AttachStdout": false,
"AttachStderr": false,
"AttachStderr": false,
"ExposedPorts": {
"ExposedPorts": {
"8989/tcp": {}
"8989/tcp": {}
},
},
"Tty": false,
"Tty": false,
"OpenStdin": false,
"OpenStdin": false,
"StdinOnce": false,
"StdinOnce": false,
"Env": [
"Env": [
"PUID=1001",
"PUID=1001",
"PGID=100",
"PGID=100",
"TZ=Asia/Manila",
"TZ=Asia/Manila",
"affinity:container==6b14e750dbad642718b63560630553ece4aab849d2f335005ac9a2810edc5317",
"affinity:container==b3f184e28153103717e5ac4965bb4da54581d7b140f407de19339d9ea4265a32",
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
"HOME=/root",
"HOME=/root",
"LANGUAGE=en_US.UTF-8",
"LANGUAGE=en_US.UTF-8",
"LANG=en_US.UTF-8",
"LANG=en_US.UTF-8",
"TERM=xterm",
"TERM=xterm",
"XDG_CONFIG_HOME=/config/xdg",
"XDG_CONFIG_HOME=/config/xdg",
"SONARR_BRANCH=master"
"SONARR_BRANCH=master"
],
],
"Cmd": null,
"Cmd": null,
"Image": "mdhiggins/sonarr-sma:latest",
"Image": "mdhiggins/sonarr-sma",
"Volumes": {
"Volumes": {
"/config": {},
"/config": {},
"/downloads": {},
"/downloads": {},
"/downloads_complete": {},
"/downloads_complete": {},
"/tv": {},
"/tv": {},
"/usr/local/bin/sma/sickbeard_mp4_automator/autoProcess.ini": {}
"/usr/local/bin/sma/sickbeard_mp4_automator/autoProcess.ini": {}
},
},
"WorkingDir": "",
"WorkingDir": "",
"Entrypoint": [
"Entrypoint": [
"/init"
"/init"
],
],
"OnBuild": null,
"OnBuild": null,
"Labels": {
"Labels": {
"MAINTAINER": "sparkyballs,TheLamer",
"MAINTAINER": "sparkyballs,TheLamer",
"build_version": "Linuxserver.io version:- 2.0.0.5322-ls22 Build-date:- 2019-06-20T07:36:27+00:00",
"build_version": "Linuxserver.io version:- 2.0.0.5322-ls22 Build-date:- 2019-06-20T07:36:27+00:00",
"com.docker.compose.config-hash": "f517f51e2f170638a180ed7c73310f273c49e0585c2e2d1ccae69d6ba3c46a38",
"com.docker.compose.config-hash": "f0d95a9fa4fa087da44c4282c10ce41e1eab96039554aa223d400e70fe21f6b1",
"com.docker.compose.container-number": "1",
"com.docker.compose.container-number": "1",
"com.docker.compose.oneoff": "False",
"com.docker.compose.oneoff": "False",
"com.docker.compose.project": "opt",
"com.docker.compose.project": "opt",
"com.docker.compose.service": "sonarr",
"com.docker.compose.service": "sonarr",
"com.docker.compose.version": "1.24.0",
"com.docker.compose.version": "1.24.0",
"maintainer": "sparklyballs"
"maintainer": "sparklyballs"
}
}
},
},
"NetworkSettings": {
"NetworkSettings": {
"Bridge": "",
"Bridge": "",
"SandboxID": "3003f92abe6c44c109a0b1861ca4024327c997bb00d01e2f3b7de02139249048",
"SandboxID": "adffed4927eb7901c935067a8e66731be26c19d9025bbbf1b4441253f5a2371e",
"HairpinMode": false,
"HairpinMode": false,
"LinkLocalIPv6Address": "",
"LinkLocalIPv6Address": "",
"LinkLocalIPv6PrefixLen": 0,
"LinkLocalIPv6PrefixLen": 0,
"Ports": {
"Ports": {
"8989/tcp": [
"8989/tcp": [
{
{
"HostIp": "0.0.0.0",
"HostIp": "0.0.0.0",
"HostPort": "8989"
"HostPort": "8989"
}
}
]
]
},
},
"SandboxKey": "/var/run/docker/netns/3003f92abe6c",
"SandboxKey": "/var/run/docker/netns/adffed4927eb",
"SecondaryIPAddresses": null,
"SecondaryIPAddresses": null,
"SecondaryIPv6Addresses": null,
"SecondaryIPv6Addresses": null,
"EndpointID": "",
"EndpointID": "",
"Gateway": "",
"Gateway": "",
"GlobalIPv6Address": "",
"GlobalIPv6Address": "",
"GlobalIPv6PrefixLen": 0,
"GlobalIPv6PrefixLen": 0,
"IPAddress": "",
"IPAddress": "",
"IPPrefixLen": 0,
"IPPrefixLen": 0,
"IPv6Gateway": "",
"IPv6Gateway": "",
"MacAddress": "",
"MacAddress": "",
"Networks": {
"Networks": {
"opt_default": {
"opt_default": {
"IPAMConfig": null,
"IPAMConfig": null,
"Links": null,
"Links": null,
"Aliases": [
"Aliases": [
"sonarr",
"59f4b5f03b31",
"0d24aff995a3",
"sonarr"
"b3f184e28153"
],
],
"NetworkID": "1dba32aca2a06d8217c5e3b56ef5888ad718f969d0d7a5722dbfa8d51005bc5a",
"NetworkID": "1dba32aca2a06d8217c5e3b56ef5888ad718f969d0d7a5722dbfa8d51005bc5a",
"EndpointID": "f2f511fb3ff5ef4069a10486c988978dcd549b4d28995fb2e61a6c80da3ba8e5",
"EndpointID": "f07930246ad9cbc4538eeeb04b1a4487c7bb33d2fd4e7d2e1cc9715534ae4764",
"Gateway": "172.19.0.1",
"Gateway": "172.19.0.1",
"IPAddress": "172.19.0.6",
"IPAddress": "172.19.0.5",
"IPPrefixLen": 16,
"IPPrefixLen": 16,
"IPv6Gateway": "",
"IPv6Gateway": "",
"GlobalIPv6Address": "",
"GlobalIPv6Address": "",
"GlobalIPv6PrefixLen": 0,
"GlobalIPv6PrefixLen": 0,
"MacAddress": "02:42:ac:13:00:06",
"MacAddress": "02:42:ac:13:00:05",
"DriverOpts": null
"DriverOpts": null
}
}
}
}
}
}
}
}
]
]
保存された差分