From 105d392924cd08999908ce230157127d34e69070 Mon Sep 17 00:00:00 2001
From: Owen Schwartz <owen@txv.io>
Date: Sat, 25 Jan 2025 12:27:27 -0500
Subject: [PATCH 1/2] docker-compose vs docker compose; Resolves #83

---
 install/main.go | 62 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/install/main.go b/install/main.go
index b21d8df5..7436c553 100644
--- a/install/main.go
+++ b/install/main.go
@@ -438,29 +438,53 @@ func isDockerInstalled() bool {
 	return true
 }
 
+func getCommandString(useNewStyle bool) string {
+	if useNewStyle {
+		return "'docker compose'"
+	}
+	return "'docker-compose'"
+}
+
 func pullAndStartContainers() error {
 	fmt.Println("Starting containers...")
 
-	// First try docker compose (new style)
-	cmd := exec.Command("docker", "compose", "-f", "docker-compose.yml", "pull")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-
-	if err != nil {
-		fmt.Println("Failed to start containers using docker compose, falling back to docker-compose command")
-		os.Exit(1)
+	// Check which docker compose command is available
+	var useNewStyle bool
+	checkCmd := exec.Command("docker", "compose", "version")
+	if err := checkCmd.Run(); err == nil {
+		useNewStyle = true
+	} else {
+		// Check if docker-compose (old style) is available
+		checkCmd = exec.Command("docker-compose", "version")
+		if err := checkCmd.Run(); err != nil {
+			return fmt.Errorf("neither 'docker compose' nor 'docker-compose' command is available: %v", err)
+		}
 	}
 
-	cmd = exec.Command("docker", "compose", "-f", "docker-compose.yml", "up", "-d")
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err = cmd.Run()
-
-	if err != nil {
-		fmt.Println("Failed to start containers using docker-compose command")
-		os.Exit(1)
+	// Helper function to execute docker compose commands
+	executeCommand := func(args ...string) error {
+		var cmd *exec.Cmd
+		if useNewStyle {
+			cmd = exec.Command("docker", append([]string{"compose"}, args...)...)
+		} else {
+			cmd = exec.Command("docker-compose", args...)
+		}
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		return cmd.Run()
 	}
 
-	return err
-}
+	// Pull containers
+	fmt.Printf("Using %s command to pull containers...\n", getCommandString(useNewStyle))
+	if err := executeCommand("-f", "docker-compose.yml", "pull"); err != nil {
+		return fmt.Errorf("failed to pull containers: %v", err)
+	}
+
+	// Start containers
+	fmt.Printf("Using %s command to start containers...\n", getCommandString(useNewStyle))
+	if err := executeCommand("-f", "docker-compose.yml", "up", "-d"); err != nil {
+		return fmt.Errorf("failed to start containers: %v", err)
+	}
+
+	return nil
+}
\ No newline at end of file

From 39a4a51b882a40927604f5e581fa8dd4a0a688f1 Mon Sep 17 00:00:00 2001
From: Owen Schwartz <owen@txv.io>
Date: Sat, 25 Jan 2025 12:55:19 -0500
Subject: [PATCH 2/2] Remove double transaction

---
 server/setup/scripts/1.0.0-beta9.ts | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/server/setup/scripts/1.0.0-beta9.ts b/server/setup/scripts/1.0.0-beta9.ts
index b5bd7838..e4f62659 100644
--- a/server/setup/scripts/1.0.0-beta9.ts
+++ b/server/setup/scripts/1.0.0-beta9.ts
@@ -14,20 +14,16 @@ export default async function migration() {
 
     try {
         await db.transaction(async (trx) => {
-            await db.transaction(async (trx) => {
-                trx.run(sql`UPDATE ${users} SET email = LOWER(email);`);
-                trx.run(
-                    sql`UPDATE ${emailVerificationCodes} SET email = LOWER(email);`
-                );
-                trx.run(
-                    sql`UPDATE ${passwordResetTokens} SET email = LOWER(email);`
-                );
-                trx.run(sql`UPDATE ${userInvites} SET email = LOWER(email);`);
-                trx.run(
-                    sql`UPDATE ${resourceWhitelist} SET email = LOWER(email);`
-                );
-                trx.run(sql`UPDATE ${resourceOtp} SET email = LOWER(email);`);
-            });
+            trx.run(sql`UPDATE ${users} SET email = LOWER(email);`);
+            trx.run(
+                sql`UPDATE ${emailVerificationCodes} SET email = LOWER(email);`
+            );
+            trx.run(
+                sql`UPDATE ${passwordResetTokens} SET email = LOWER(email);`
+            );
+            trx.run(sql`UPDATE ${userInvites} SET email = LOWER(email);`);
+            trx.run(sql`UPDATE ${resourceWhitelist} SET email = LOWER(email);`);
+            trx.run(sql`UPDATE ${resourceOtp} SET email = LOWER(email);`);
         });
     } catch (error) {
         console.log(