From a6993abb6fc326e96837e0206d72ed21d7dbe2a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= <lindesvard@gmail.com>
Date: Sat, 28 Jun 2025 06:59:57 +0200
Subject: [PATCH] fix: self-hosting had trial

---
 apps/dashboard/Dockerfile | 4 +++-
 self-hosting/coolify.yml  | 6 +++---
 sh/docker-build           | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/dashboard/Dockerfile b/apps/dashboard/Dockerfile
index 23ac7f02..3d25011e 100644
--- a/apps/dashboard/Dockerfile
+++ b/apps/dashboard/Dockerfile
@@ -13,6 +13,9 @@ ENV DATABASE_URL=$DATABASE_URL
 ARG ENABLE_INSTRUMENTATION_HOOK
 ENV ENABLE_INSTRUMENTATION_HOOK=$ENABLE_INSTRUMENTATION_HOOK
 
+ARG NEXT_PUBLIC_SELF_HOSTED
+ENV NEXT_PUBLIC_SELF_HOSTED=$NEXT_PUBLIC_SELF_HOSTED
+
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
 
@@ -63,7 +66,6 @@ WORKDIR /app/apps/dashboard
 # Will be replaced on runtime
 ENV NEXT_PUBLIC_DASHBOARD_URL="__NEXT_PUBLIC_DASHBOARD_URL__"
 ENV NEXT_PUBLIC_API_URL="__NEXT_PUBLIC_API_URL__"
-ENV NEXT_PUBLIC_SELF_HOSTED="__NEXT_PUBLIC_SELF_HOSTED__"
 
 RUN pnpm run build
 
diff --git a/self-hosting/coolify.yml b/self-hosting/coolify.yml
index b6766e0e..df5c46be 100644
--- a/self-hosting/coolify.yml
+++ b/self-hosting/coolify.yml
@@ -104,7 +104,7 @@ services:
         hard: 262144
 
   opapi:
-    image: lindesvard/openpanel-api:1.2.0
+    image: lindesvard/openpanel-api:latest
     restart: always
     command: >
       sh -c "
@@ -158,7 +158,7 @@ services:
       retries: 5
 
   opdashboard:
-    image: lindesvard/openpanel-dashboard:1.2.0
+    image: lindesvard/openpanel-dashboard:latest
     restart: always
     depends_on:
       opapi:
@@ -183,7 +183,7 @@ services:
       retries: 5
 
   opworker:
-    image: lindesvard/openpanel-worker:1.2.0
+    image: lindesvard/openpanel-worker:latest
     restart: always
     depends_on:
       opapi:
diff --git a/sh/docker-build b/sh/docker-build
index 9e28310a..4e2690ca 100755
--- a/sh/docker-build
+++ b/sh/docker-build
@@ -21,7 +21,7 @@ fi
 if [ -z "$PRERELEASE" ]; then
     read -p "You're building WITHOUT any pre-release ($VERSION). Do you wish to continue (y/N)? " -n 1 -r
 else
-    read -p "You're building WITH pre-release ($VERSION-$PRERELEASE). Do you wish to continue (y/N)? " -n 1 -r
+    read -p "You're building WITH pre-release ($VERSION). Do you wish to continue (y/N)? " -n 1 -r
 fi
 echo    # Move to a new line
 if [[ ! $REPLY =~ ^[Yy]$ ]]
@@ -41,12 +41,12 @@ build_image() {
     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 "$full_version" \
             --build-arg DATABASE_URL="postgresql://p@p:5432/p" \
+            --build-arg NEXT_PUBLIC_SELF_HOSTED="true" \
             -f "apps/$app/Dockerfile" \
             --push \
             .
@@ -57,6 +57,7 @@ build_image() {
             -t "$full_version" \
             -t "$image_name:latest" \
             --build-arg DATABASE_URL="postgresql://p@p:5432/p" \
+            --build-arg NEXT_PUBLIC_SELF_HOSTED="true" \
             -f "apps/$app/Dockerfile" \
             --push \
             .