resolve conflict

conf.dockerimages

@@ -23,30 +23,21 @@ regexp=^<none>.*$
 colours=bold red
 =====
 # Size 'K'
-regexp=\s\d*[\.,]?\d*\s(KB?|B)
+regexp=\s\d*[\.,]?\d*\sKB?
 colours=green
 ======
-# Size 'M'
-regexp=\s\d*[\.,]?\d*\sMB?
+# Size 'M', 2 digits
+regexp=\s\d{1,2}[\.,]?\d*\sMB?
+colours=green
+======
+# Size 'M' 3+ digits
+regexp=\s\d{3,4}[\.,]?\d*\sMB?
 colours=yellow
 ======
 # Size 'G'
 regexp=\s\d*[\.,]?\d*\sGB?
 colours=red
-=====
-# CREATED hours
-regexp=\s+\d+\shours\s\w+
-colours=bright_green
 ======
-# CREATED days
-regexp=\s+\d+\sdays\s\w+
-colours=green
-======
-# CREATED weeks
-regexp=\s+\d+\sweeks\s\w+
-colours=yellow
-======
-# CREATED months
-regexp=\s+\d+\smonths\s\w+
-colours=red
-
+# Date Ago
+regexp=(?:\s{2}|^)(?:\w+\s)+ago
+colours=cyan

conf.dockerps

@@ -1,56 +1,34 @@
-# HEADERS
-regexp=(?:\s|^)(CONTAINER ID|IMAGE|COMMAND|CREATED|STATUS|PORTS|NAMES|Name|Command|State|Ports)(?:\s|$)
+# This is for docker ps and docker-compose ps
+# Headers
+regexp=(?:\s{2}|^)(CONTAINER ID|IMAGE|COMMAND|CREATED|STATUS|PORTS|NAMES|Name|Command|State|Ports)(?:\s|$)
 colours=default,underline
 ======
-# Commands
-regexp=(?:\s\")(.*)(?:\")
+# Commands (docker ps)
+regexp=(?:\s{2}|^)(?:\s\")(.*)(?:\")(?:\s{2}|$)
 colours=magenta
-======
-# https://github.com/docker/docker/blob/e5a3f86e447dd659da3c2e759f3c088a0bfcfe3d/container/state.go#L40
-# Statuses - Up / Restarting
-regexp=\sUp(.*)\s
-colours=bold green
-======
-# Statuses - Exited
-regexp=\sExited(?:\s\(\d\)?)(.*)\s
-colours=concealed red
-======
-# Ip Addresses / Ports
-regexp=(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\:)?(?:\d{1,5}))?(?:->)?(\d{1,5}(\/)\w+)
-colours=default,bold blue,default,bold blue,default
 =======
-regexp=(?:\s|^)(CONTAINER ID|IMAGE|COMMAND|CREATED|STATUS|PORTS|NAMES)(?:\s|$)
-colours=default,underline
+# Date Ago (docker ps)
+regexp=(?:\s{2}|^)(?:\w+\s)+ago
+colours=cyan
 ======
-# IMAGE
-regexp=^(?!CONTAINER)(\w+)\s+([^\s]+)\s+(".*")\s+(.*(?=(?:Up|Exited|Created|Restarting)))
-colours=default,bright_black,bold white,bright_black,cyan
-======
-# Statuses - Created
-regexp=\sCreated\s
-colours=blue
-======
-# Statuses - Up / Restarting
-regexp=\sUp\s(\d+|\w+)\s\w+(?:\s\w+)?
+# Statuses
+# https://github.com/docker/docker/blob/e5a3f86e447dd659da3c2e759f3c088a0bfcfe3d/container/state.go#L40
+# Up
+regexp=(?:\s{2}|^)(?:Up|Restarting)(?:(?:\s[\w,\d,(,)]+)+)?
 colours=bold green
 ======
-# Statuses - Exited
-regexp=\sExited\s.(\d+).\s.+ago
-colours=bold red,red
-======
-# Statuses - Restarting
-regexp=\sRestarting\s.(\d+).\s.+ago
-colours=bold blue
-======
+# Exited
+regexp=(?:\s{2}|^)(?:Exited|Exit|Dead|Removal In Progress)(?:(?:\s[\w,\d,(,)]+)+)?
+colours=bold red
+=======
 # Ip Addresses / Ports
-regexp=(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\:)?(\d{1,5}))?(?:->)?(\d{1,5}(\/)\w+)
-colours=default,blue,default,bright_green,bright_blue,default
-======
-# NAMES
-regexp=\s([a-z-_0-9]+)$
-colours=default,bold yellow
-======
-# CONTAINER ID
-regexp=^([a-z-_0-9]+)\s
-colours=default,cyan
-
+regexp=(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(\:)?(\d{1,5}))?(->)?(\d{1,5})(\/)(\w+)
+colours=blue,default,bright_green,default,bright_green,default,bright_blue
+=======
+# Name and command in docker-compose ps.
+regexp=(?:\s{2}|^)(?:[a-z\-_0-9]+)(?:\s{2}|$)(?:\s+(.+?)\s{2,})?
+colours=bold yellow,magenta
+=======
+# Container ID / Image ID and Image. Need to be together to override the "name" regex.
+regexp=(?:\s{2}|^)([a-z0-9]+)\s{2,}((?:(?:[a-z\-_0-9\.]+)+(\/|:)?)+)
+colours=default,cyan,default