knowage

Websoft9 · Jul 19, 2024 · 2ca2299 · 2ca2299
1 parent 42845f4
commit 2ca2299
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 26 deletions.
diff --git a/apps/knowage/.env b/apps/knowage/.env
@@ -1,7 +1,7 @@
 W9_REPO=knowagelabs/knowage-server-docker
 W9_DIST=community
-# 8.1 not stable
-W9_VERSION=7.4
+# 8.2 is stable
+W9_VERSION=8.1
 W9_POWER_PASSWORD=uQ8E1wVTzG8SOk3!
 
 #### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
@@ -10,10 +10,9 @@ W9_HTTP_PORT_SET=9001
 W9_HTTP_PORT=8080
 
 W9_LOGIN_USER=biadmin
-W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
+W9_LOGIN_PASSWORD=biadmin
 W9_ADMIN_PATH="/knowage"
 W9_URL=internet_ip
-
 W9_DB_EXPOSE="mariadb"
 W9_MARIADB_VERSION=10.3
 
@@ -42,5 +41,5 @@ PASSWORD_ENCRYPTION_SECRET=def456
 SENSIBLE_DATA_ENCRYPTION_SECRET=ghi789
 PUBLIC_ADDRESS=0.0.0.0
 
-HAZELCAST_HOSTS=hazelcast
+HAZELCAST_HOSTS=$W9_ID-hazelcast
 HAZELCAST_PORT=5701
diff --git a/apps/knowage/cmd.sh b/apps/knowage/cmd.sh
diff --git a/apps/knowage/docker-compose.yml b/apps/knowage/docker-compose.yml
@@ -18,15 +18,10 @@ services:
     volumes:
       - knowage:/home/knowage/apache-tomcat/resources
     env_file: .env
-    command: bash -c "cat /my_cmd > /home/knowage/cmd.sh && chmod +x /home/knowage/cmd.sh && /home/knowage/cmd.sh"
-    configs:
-      - source: my_cmd
 
-  # from Knowage8 need this service
   hazelcast:
-    image: hazelcast/hazelcast:3.6
+    image: hazelcast/hazelcast:3.6.5
     container_name: $W9_ID-hazelcast
-    env_file: .env
     environment:
       - JAVA_OPTS=-Dhazelcast.local.publicAddress=hazelcast -Dhazelcast.config=/opt/hazelcast/hazelcast.xml
     volumes:
@@ -36,7 +31,6 @@ services:
     image: mariadb:$W9_MARIADB_VERSION
     container_name: $W9_ID-mariadb
     restart: unless-stopped
-    env_file: .env
     environment:
       - MARIADB_USER=$W9_ID
       - MARIADB_PASSWORD=$W9_POWER_PASSWORD
@@ -49,7 +43,6 @@ services:
     image: mariadb:$W9_MARIADB_VERSION
     container_name: $W9_ID-cache
     restart: unless-stopped
-    env_file: .env
     environment:
       - MARIADB_USER=${W9_ID}_cache
       - MARIADB_PASSWORD=$W9_POWER_PASSWORD
@@ -62,15 +55,17 @@ services:
     container_name: $W9_ID-python
     image: knowagelabs/knowage-python-docker:$W9_VERSION
     restart: unless-stopped
-    env_file: .env
     environment:
-      - KNOWAGE_PUBLIC_ADDRESS=knowage
+      - HMAC_KEY=$HMAC_KEY
+      - KNOWAGE_PUBLIC_ADDRESS=$W9_ID
+      - PUBLIC_ADDRESS=$PUBLIC_ADDRESS
 
   knowager:
     container_name: $W9_ID-r
     image: knowagelabs/knowage-r-docker:$W9_VERSION
     restart: unless-stopped
-    env_file: .env
+    environment:
+      - HMAC_KEY=$HMAC_KEY    
 
 networks:
   default:

diff --git a/apps/knowage/src/README.md b/apps/knowage/src/README.md
@@ -0,0 +1,3 @@
+# About
+
+This folder includes files mount to container and used by Websoft9
diff --git a/apps/knowage/src/after_up.sh b/apps/knowage/src/after_up.sh
diff --git a/apps/knowage/src/get_version.sh b/apps/knowage/src/get_version.sh
diff --git a/apps/knowage/src/hazelcast-server.xml b/apps/knowage/src/hazelcast-server.xml
@@ -1,5 +1,3 @@
-# hazelcast image not have this file, it from: https://github.com/KnowageLabs/Knowage-Server-Docker/blob/master/Knowage-Server-Docker/hazelcast-server.xml
-
 <?xml version="1.0" encoding="UTF-8"?>
 <hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.6.xsd"
            xmlns="http://www.hazelcast.com/schema/config"

diff --git a/apps/knowage/variables.json b/apps/knowage/variables.json
@@ -6,7 +6,7 @@
   "edition": [
     {
       "dist": "community",
-      "version": ["7.4.18"]
+      "version": ["8.1"]
     }
   ],
   "requirements": {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# About

		This folder includes files mount to container and used by Websoft9