From 1cfd7e7e1b70d59d8c521d188b712a55a7a048cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Mon, 9 Jun 2025 17:22:56 +0200
Subject: [PATCH] fix(dashboard): dockerfile + other self-hosting issues

---
 apps/dashboard/Dockerfile |  1 +
 self-hosting/update       |  2 +-
 sh/docker-build           | 34 ++++++++++++++++++----------------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/apps/dashboard/Dockerfile b/apps/dashboard/Dockerfile
index 8fc570d7..2ce4936a 100644
--- a/apps/dashboard/Dockerfile
+++ b/apps/dashboard/Dockerfile
@@ -41,6 +41,7 @@ COPY packages/common/package.json packages/common/package.json
 COPY packages/auth/package.json packages/auth/package.json
 COPY packages/email/package.json packages/email/package.json
 COPY packages/constants/package.json packages/constants/package.json
+COPY packages/payments/package.json packages/payments/package.json
 COPY packages/validation/package.json packages/validation/package.json
 COPY packages/integrations/package.json packages/integrations/package.json
 COPY packages/sdks/sdk/package.json packages/sdks/sdk/package.json
diff --git a/self-hosting/update b/self-hosting/update
index c00736fa..af21ba43 100755
--- a/self-hosting/update
+++ b/self-hosting/update
@@ -6,6 +6,6 @@ echo "Pulling latest docker images"
 docker compose pull
 
 echo "Restarting services"
-docker compose restart
+docker compose up -d --remove-orphans
 
 echo "Done"
diff --git a/sh/docker-build b/sh/docker-build
index b46ec17d..9e28310a 100755
--- a/sh/docker-build
+++ b/sh/docker-build
@@ -38,34 +38,36 @@ docker buildx create --name multi-arch-builder --use || true
 build_image() {
     local app=$1
     local image_name="lindesvard/openpanel-$app"
-    
-    
-    # Prepare tags based on whether PRERELEASE is provided
-    if [ -z "$PRERELEASE" ]; then
-        echo "Building multi-architecture image for $image_name:$VERSION"
+    local full_version="$image_name:$VERSION"
+
+    if [ -n "$PRERELEASE" ]; then
+        full_version="$full_version-$PRERELEASE"
+        echo "(pre-release) Building multi-architecture image for $full_version"
         docker buildx build \
             --platform linux/amd64,linux/arm64 \
-            -t "$image_name:$VERSION" \
+            -t "$full_version" \
+            --build-arg DATABASE_URL="postgresql://p@p:5432/p" \
+            -f "apps/$app/Dockerfile" \
+            --push \
+            .
+    else
+        echo "(latest) Building multi-architecture image for $full_version"
+        docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            -t "$full_version" \
             -t "$image_name:latest" \
             --build-arg DATABASE_URL="postgresql://p@p:5432/p" \
             -f "apps/$app/Dockerfile" \
-            .
-    else
-        echo "Building multi-architecture image for $image_name:$VERSION-$PRERELEASE"
-        docker buildx build \
-            --platform linux/amd64,linux/arm64 \
-            -t "$image_name:$VERSION-$PRERELEASE" \
-            --build-arg DATABASE_URL="postgresql://p@p:5432/p" \
-            -f "apps/$app/Dockerfile" \
+            --push \
             .
     fi
     
     if [ $? -ne 0 ]; then
-        echo "Failed to build $image_name:$VERSION"
+        echo "Failed to build $full_version"
         exit 1
     fi
     
-    echo "Successfully built and pushed multi-architecture image for $image_name:$VERSION"
+    echo "Successfully built and pushed multi-architecture image for $full_version"
 }
 
 if [ "$APP" == "all" ]; then