Merge pull request #1336 from Websoft9/update-unleash-7ae60e5b

Update unleash

Author: qiaofeng1227

apps/unleash/.env

@@ -1,53 +1,34 @@
-W9_REPO="wordpress"
-W9_DIST=community
-W9_VERSION="latest"
+W9_REPO="unleashorg/unleash-server"
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='2InvwI3jGiP6etA'
+W9_ID='unleash'
+W9_HTTP_PORT_SET='9001'
+W9_HTTP_PORT=4242
 
-W9_POWER_PASSWORD="1PrMxExC45LsCT"
 
-# Environments which for user settings when create application
-# Named expression: W9_xxx_xxx_SET, xxx refer to file fields
-W9_HTTP_PORT_SET=9001
-# W9_HTTPS_PORT_SET=9002
-# W9_DB_PORT_SET=3306
-# W9_SSH_PORT_SET=23
-W9_KEY_SET="dfsjdkjf77xjxcjcj"
-
-#### --  Not allowed to edit below environments when recreate app based on existing data  -- ####
-
-W9_ID=unleash
+W9_LOGIN_USER=admin
+W9_LOGIN_PASSWORD=unleash4all
 
-# W9_HTTP_PORT or W9_HTTPS_PORT is need at leaset and used for proxy for web application
-# Some container (e.g teleport) need HTTPS access, then need to set this pra
-W9_HTTP_PORT=80
-W9_HTTPS_PORT=81
 
-W9_LOGIN_USER=admin
-# use https://1password.com/zh-cn/password-generator/  to genarate 14 bit password
-# this password can also use password file
-W9_LOGIN_PASSWORD=$W9_POWER_PASSWORD
-W9_ADMIN_PATH="/wp-login"
-
-# Container name's suffix must use one of the value
-W9_DB_EXPOSE="mysql,postgresql,mariadb,mongodb,redis"
-
-# It is used when the application APP needs to set an external URL, which can be IP(or domain), IP:PORT
-# If have protocols, should be set it in the APP's ENV
-W9_URL=internet_ip:$W9_HTTP_PORT_SET
-# modifies W9_URL on init when it is true
+W9_DB_EXPOSE="postgresql"
+W9_URL='internet_ip:$W9_HTTP_PORT_SET'
 W9_URL_REPLACE=true
-
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
 
-# Below environment is created by this app
-
-WORDPRESS_DB_HOST=$W9_ID-mariadb
-WORDPRESS_DB_USER=wordpress  #if use postgresql, it need set to postgres
-WORDPRESS_DB_PASSWORD=$W9_POWER_PASSWORD
-WORDPRESS_DB_NAME=wordpress
-
+# Below environment is created by this app: https://docs.getunleash.io/using-unleash/deploy/configuring-unleash
 
-#W9_NAME=""
-#W9_RCODE=""
+#DB URL not allowed # string
+DATABASE_URL: "postgres://postgres:${W9_POWER_PASSWORD}@${W9_ID}-postgresql/unleash"
+DATABASE_SSL: "false"
+LOG_LEVEL: "warn"
+# Proxy clients must use one of these keys to connect to the
+# Proxy. To add more keys, separate them with a comma (`key1,key2`).
+INIT_FRONTEND_API_TOKENS: "default:development.unleash-insecure-frontend-api-token"
+# Initialize Unleash with a default set of client API tokens. To
+# initialize Unleash with multiple tokens, separate them with a
+# comma (`token1,token2`).
+INIT_CLIENT_API_TOKENS: "default:development.unleash-insecure-api-token"

apps/unleash/Dockerfile

@@ -1,48 +1,52 @@
-# image,docs: https://hub.docker.com/_/wordpress/
+# image: https://github.com/Unleash/unleash/blob/main/docker-compose.yml
+# docs: https://github.com/Unleash/unleash
 
 services:
-
-  wordpress:
+  unleash:
     image: $W9_REPO:$W9_VERSION
     container_name: $W9_ID
     restart: unless-stopped
-    #This is for access host from container
-    # extra_hosts: ["host.docker.internal:host-gateway"]
-    # command: |
-    #   /bin/bash -c "ping -c 3 host.docker.internal"
-    logging:
-      driver: "json-file"
-      options:
-          max-file: "5"
-          max-size: 10m
-    deploy:
-      resources:
-        limits:
-          memory: 5g
-          cpus: '0.7'
     ports:
-      - $W9_HTTP_PORT_SET:80
-    env_file: .env
-    volumes:
-      - wordpress:/var/www/html
-      - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
+      - $W9_HTTP_PORT_SET:4242
+    env_file: 
+      - .env
+    depends_on:
+      db:
+        condition: service_healthy
+    command: [ "node", "index.js" ]
+    healthcheck:
+      test: wget --no-verbose --tries=1 --spider http://localhost:4242/health || exit 1
+      interval: 1s
+      timeout: 1m
+      retries: 5
+      start_period: 15s
 
-  mariadb:
-    image: mariadb:10.4
-    container_name: $W9_ID-mariadb
+  db:
+    image: postgres:15
+    container_name: $W9_ID-postgresql
     restart: unless-stopped
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "pg_isready",
+          "--username=postgres",
+          "--host=127.0.0.1",
+          "--port=5432"
+        ]
+      interval: 2s
+      timeout: 1m
+      retries: 5
+      start_period: 10s
     volumes:
-      - mysql_data:/var/lib/mysql
+      - pgdata:/var/lib/postgresql/data
     environment:
-      MYSQL_DATABASE: $WORDPRESS_DB_NAME
-      MYSQL_USER: $WORDPRESS_DB_USER
-      MYSQL_PASSWORD: $W9_POWER_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
+      POSTGRES_DB: unleash
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: ${W9_POWER_PASSWORD}
 
 volumes:
-  wordpress:
-  mysql_data:
+  pgdata:
 
 networks:
   default:

apps/unleash/docker-compose.yml

@@ -7,15 +7,13 @@
   "edition": [
     {
       "dist": "community",
-      "version": [
-        "latest"
-      ]
+      "version": ["6","latest"]
     }
   ],
   "requirements": {
-    "cpu": "2",
-    "memory": "4",
-    "disk": "10",
+    "cpu": "1",
+    "memory": "2",
+    "disk": "1",
     "url": "https://getunleash.io"
   }
 }