From 428b7f0ea33f252ad8c286fc2608ad6648835247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20D=C3=BCren?=
 <andreasdueren@Andreass-Mini.fritz.box>
Date: Tue, 18 Mar 2025 19:15:11 +0100
Subject: [PATCH] Fixed creation of db_override.go in writable location

---
 start.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/start.sh b/start.sh
index a60a539..0849c39 100644
--- a/start.sh
+++ b/start.sh
@@ -344,10 +344,10 @@ else
     echo "==> Cannot modify /etc/hosts (read-only filesystem)"
 fi
 
-# Create the overrides directory and db_override.go file
-mkdir -p "$SERVER_DIR/overrides"
-echo "==> Creating db_override.go in overrides directory"
-cat > "$SERVER_DIR/overrides/db_override.go" <<EOT
+# Create the overrides directory in writable location
+mkdir -p "/app/data/overrides"
+echo "==> Creating db_override.go in writable overrides directory"
+cat > "/app/data/overrides/db_override.go" <<EOT
 // Override database functions - will be added to museum build
 package main
 
@@ -396,7 +396,7 @@ func forceCorrectDatabase() (*sql.DB, error) {
 	return sql.Open("postgres", connStr)
 }
 EOT
-echo "==> Created overrides/db_override.go"
+echo "==> Created db_override.go in writable location: /app/data/overrides"
 
 # Patch source code directly for maximum effectiveness
 if [ -d "$SERVER_DIR/cmd/museum" ]; then
@@ -472,7 +472,7 @@ CLOUDRON_POSTGRESQL_PORT="${CLOUDRON_POSTGRESQL_PORT}" \
 CLOUDRON_POSTGRESQL_USERNAME="${CLOUDRON_POSTGRESQL_USERNAME}" \
 CLOUDRON_POSTGRESQL_PASSWORD="${CLOUDRON_POSTGRESQL_PASSWORD}" \
 CLOUDRON_POSTGRESQL_DATABASE="${CLOUDRON_POSTGRESQL_DATABASE}" \
-go run -ldflags "-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'" overrides/db_override.go cmd/museum/main.go db force 25
+go run -ldflags "-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'" /app/data/overrides/db_override.go cmd/museum/main.go db force 25
 EOF
     chmod +x /tmp/run_migration.sh
     
@@ -534,10 +534,10 @@ EOF
     # Check if we have a patched main.go to use
     if [ -f "/app/data/patched/main.go" ]; then
         echo "Using patched main.go from writable location"
-        echo "go run -ldflags \"-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'\" overrides/db_override.go /app/data/patched/main.go serve" >> /tmp/run_server.sh
+        echo "go run -ldflags \"-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'\" /app/data/overrides/db_override.go /app/data/patched/main.go serve" >> /tmp/run_server.sh
     else
         echo "Using original main.go from read-only location"
-        echo "go run -ldflags \"-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'\" overrides/db_override.go cmd/museum/main.go serve" >> /tmp/run_server.sh
+        echo "go run -ldflags \"-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'\" /app/data/overrides/db_override.go cmd/museum/main.go serve" >> /tmp/run_server.sh
     fi
     
     chmod +x /tmp/run_server.sh
@@ -704,10 +704,10 @@ EOF
     # Check if we have a patched main.go to use
     if [ -f "/app/data/patched/main.go" ]; then
         echo "Using patched main.go from writable location"
-        echo "go run -ldflags \"-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'\" overrides/db_override.go /app/data/patched/main.go serve --port $PUBLIC_ALBUMS_PORT" >> /tmp/run_public_server.sh
+        echo "go run -ldflags \"-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'\" /app/data/overrides/db_override.go /app/data/patched/main.go serve --port $PUBLIC_ALBUMS_PORT" >> /tmp/run_public_server.sh
     else
         echo "Using original main.go from read-only location"
-        echo "go run -ldflags \"-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'\" overrides/db_override.go cmd/museum/main.go serve --port $PUBLIC_ALBUMS_PORT" >> /tmp/run_public_server.sh
+        echo "go run -ldflags \"-X 'github.com/lib/pq.defaulthost=${MUSEUM_DB_HOST}'\" /app/data/overrides/db_override.go cmd/museum/main.go serve --port $PUBLIC_ALBUMS_PORT" >> /tmp/run_public_server.sh
     fi
     
     chmod +x /tmp/run_public_server.sh