From a0331a544a3b44b772886c1ea2d083e4bb1613d5 Mon Sep 17 00:00:00 2001
From: Alexander Onnikov <Alexander.Onnikov@xored.com>
Date: Mon, 16 Sep 2024 20:50:14 +0700
Subject: [PATCH] Update self-host to Huly v295

Signed-off-by: Alexander Onnikov <Alexander.Onnikov@xored.com>
---
 setup.sh              |  2 +-
 template.compose.yaml | 21 ++++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/setup.sh b/setup.sh
index 3ae147d..1f42cda 100755
--- a/setup.sh
+++ b/setup.sh
@@ -4,4 +4,4 @@ echo "Setting Huly Server Address: $SERVER_ADDRESS"
 envsubst < template.conf > nginx.conf
 envsubst < template.env > .env
 
-./use-version.sh v0.6.280
+./use-version.sh v0.6.295
diff --git a/template.compose.yaml b/template.compose.yaml
index 93ffca2..2046a19 100644
--- a/template.compose.yaml
+++ b/template.compose.yaml
@@ -1,4 +1,4 @@
-version: "3"
+name: huly-selfhost
 services:
   mongodb:
     image: "mongo:7-jammy"
@@ -57,11 +57,25 @@ services:
       - MINIO_ACCESS_KEY=minioadmin
       - MINIO_SECRET_KEY=minioadmin
       - FRONT_URL=http://front:8080
-      - INIT_WORKSPACE=demo-tracker
       - MODEL_ENABLED=*
       - ACCOUNTS_URL=http://${SERVER_ADDRESS}:3000
       - ACCOUNT_PORT=3000
     restart: unless-stopped
+  workspace:
+    image: hardcoreeng/workspace:${HULY_VERSION}
+    links:
+      - mongodb
+      - minio
+    environment:
+      - SERVER_SECRET=secret
+      - MONGO_URL=mongodb://mongodb:27017
+      - TRANSACTOR_URL=ws://transactor:3333;ws://${SERVER_ADDRESS}:3333
+      - MINIO_ENDPOINT=minio
+      - MINIO_ACCESS_KEY=minioadmin
+      - MINIO_SECRET_KEY=minioadmin
+      - MODEL_ENABLED=*
+      - ACCOUNTS_URL=http://account:3000
+    restart: unless-stopped
   front:
     image: hardcoreeng/front:${HULY_VERSION}
     links:
@@ -83,7 +97,6 @@ services:
       - UPLOAD_URL=/files
       - ELASTIC_URL=http://elastic:9200
       - COLLABORATOR_URL=ws://${SERVER_ADDRESS}:3078
-      - COLLABORATOR_API_URL=http://${SERVER_ADDRESS}:3078
       - MINIO_ENDPOINT=minio
       - MINIO_ACCESS_KEY=minioadmin
       - MINIO_SECRET_KEY=minioadmin
@@ -104,7 +117,6 @@ services:
       - COLLABORATOR_PORT=3078
       - SECRET=secret
       - ACCOUNTS_URL=http://account:3000
-      - UPLOAD_URL=/files
       - MONGO_URL=mongodb://mongodb:27017
       - MINIO_ENDPOINT=minio
       - MINIO_ACCESS_KEY=minioadmin
@@ -137,7 +149,6 @@ services:
       - SERVER_PROVIDER=ws
       - ACCOUNTS_URL=http://account:3000
       - LAST_NAME_FIRST=true
-      - UPLOAD_URL=http://${SERVER_ADDRESS}/files
     restart: unless-stopped
   rekoni:
     image: hardcoreeng/rekoni-service:${HULY_VERSION}