From 54b9bae6737f84ae9161fcc102ebf8e730a40ea2 Mon Sep 17 00:00:00 2001
From: "Joel D. Elkins" <joel@elkins.co>
Date: Sat, 13 Aug 2022 02:32:31 -0500
Subject: [PATCH] Fix container.Reorder

---
 internal/pkg/container/ordering.go | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/internal/pkg/container/ordering.go b/internal/pkg/container/ordering.go
index f5a29ed..b1d1549 100644
--- a/internal/pkg/container/ordering.go
+++ b/internal/pkg/container/ordering.go
@@ -34,22 +34,16 @@ const (
 func Reorder(conts []Container, op operation) {
 	// null orderings go first for either start or stop, as they are executed asynchronously
 	norm := func(a, b Container) bool {
-		if !a.StartOrder.Valid {
-			return true
-		}
-		if !b.StartOrder.Valid {
-			return false
-		}
 		return a.StartOrder.ValueOrZero() < b.StartOrder.ValueOrZero()
 	}
 	rev := func(a, b Container) bool {
-		if !a.StartOrder.Valid {
+		if a.StartOrder.ValueOrZero() == 0 {
 			return true
 		}
-		if !b.StartOrder.Valid {
+		if b.StartOrder.ValueOrZero() == 0 {
 			return false
 		}
-		return b.StartOrder.ValueOrZero() > a.StartOrder.ValueOrZero()
+		return norm(b, a)
 	}
 	var sorter func(a, b Container) bool
 	if op == Start {