Merge pull request #35 from hcengineering/huly-v295-update

Huly v295 update

kube/account/account-deployment.yaml

@@ -56,7 +56,7 @@ spec:
                   name: huly-secret
                   key: SERVER_SECRET
             - name: TRANSACTOR_URL
-              value: ws://transactor/
+              value: ws://transactor:3333;ws://localhost:3333
             - name: ENDPOINT_URL
               valueFrom:
                 configMapKeyRef:

kube/collaborator/collaborator-deployment.yaml

@@ -45,10 +45,6 @@ spec:
                 secretKeyRef:
                   name: huly-secret
                   key: SERVER_SECRET
-            - name: TRANSACTOR_URL
-              value: ws://transactor/
-            - name: UPLOAD_URL
-              value: /files
           image: hardcoreeng/collaborator:latest
           name: collaborator
           ports:

kube/front/front-deployment.yaml

@@ -78,11 +78,6 @@ spec:
               value: http://telegram:8086
             - name: TITLE
               value: Huly Self Hosted
-            - name: TRANSACTOR_URL
-              valueFrom:
-                configMapKeyRef:
-                  name: huly-config
-                  key: TRANSACTOR_URL
             - name: UPLOAD_URL
               value: /files
           image: hardcoreeng/front:latest

kube/transactor/transactor-deployment.yaml

@@ -66,8 +66,6 @@ spec:
                 secretKeyRef:
                   name: huly-secret
                   key: SERVER_SECRET
-            - name: UPLOAD_URL
-              value: /files
           image: hardcoreeng/transactor:latest
           name: transactor
           ports:

kube/workspace/workspace-deployment.yaml

@@ -0,0 +1,57 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: workspace
+  name: workspace
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: workspace
+  template:
+    metadata:
+      labels:
+        app: workspace
+    spec:
+      containers:
+        - env:
+            - name: ACCOUNTS_URL
+              value: http://account
+            - name: MINIO_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: huly-secret
+                  key: MINIO_ACCESS_KEY
+            - name: MINIO_ENDPOINT
+              valueFrom:
+                configMapKeyRef:
+                  name: huly-config
+                  key: MINIO_ENDPOINT
+            - name: MINIO_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: huly-secret
+                  key: MINIO_SECRET_KEY
+            - name: MODEL_ENABLED
+              value: '*'
+            - name: MONGO_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: huly-config
+                  key: MONGO_URL
+            - name: SERVER_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: huly-secret
+                  key: SERVER_SECRET
+            - name: TRANSACTOR_URL
+              value: ws://transactor:3333;ws://localhost:3333
+            - name: NOTIFY_INBOX_ONLY
+              value: true
+          image: hardcoreeng/workspace:latest
+          name: workspace
+          resources:
+            limits:
+              memory: "512M"
+      restartPolicy: Always

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

template.compose.yaml

@@ -1,4 +1,4 @@
-version: "3"
+name: huly-selfhost
 services:
   mongodb:
     image: "mongo:7-jammy"
@@ -53,15 +53,26 @@ services:
       - 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
+      - STORAGE_CONFIG=minio|localhost?accessKey=minioadmin&secretKey=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
+      - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin
+      - MODEL_ENABLED=*
+      - ACCOUNTS_URL=http://account:3000
+      - NOTIFY_INBOX_ONLY=true
+    restart: unless-stopped
   front:
     image: hardcoreeng/front:${HULY_VERSION}
     links:
@@ -83,10 +94,7 @@ 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
+      - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin
       - MONGO_URL=mongodb://mongodb:27017
       - TITLE=Huly Self Hosted
       - DEFAULT_LANGUAGE=en
@@ -104,11 +112,8 @@ 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
-      - MINIO_SECRET_KEY=minioadmin
+      - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin
     restart: unless-stopped
   transactor:
     image: hardcoreeng/transactor:${HULY_VERSION}
@@ -129,15 +134,12 @@ services:
       - MONGO_URL=mongodb://mongodb:27017
       - METRICS_CONSOLE=false
       - METRICS_FILE=metrics.txt
-      - MINIO_ENDPOINT=minio
-      - MINIO_ACCESS_KEY=minioadmin
-      - MINIO_SECRET_KEY=minioadmin
+      - STORAGE_CONFIG=minio|minio?accessKey=minioadmin&secretKey=minioadmin
       - REKONI_URL=http://rekoni:4004
       - FRONT_URL=http://${SERVER_ADDRESS}:8087
       - 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}