Merge pull request #1243 from Websoft9/update-g4f-b4c931bc

Update g4f

apps/g4f/.env

@@ -1,47 +1,13 @@
-W9_REPO=wordpress
-W9_DIST=community
-W9_VERSION=latest
-
-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=g4f
-
-# 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_URL_REPLACE=true
-
+W9_REPO=hlohaus789/g4f
+W9_DIST='community'
+W9_VERSION='latest'
+W9_POWER_PASSWORD='vMGK35doE9w#Zvoi'
+W9_HTTP_PORT_SET='9001'
+W9_ID='g4f'
+W9_HTTP_PORT=8080
+W9_URL='internet_ip:$W9_HTTP_PORT_SET'
 W9_NETWORK=websoft9
 
 #### ----------------------------------------------------------------------------------------- ####
 
-
-# Below environment is created by apphub
-
-#W9_NAME=""
-#W9_RCODE=""
+# Below environment is created by this app: https://hub.docker.com/r/hlohaus789/g4f

apps/g4f/Notes.md

@@ -1,2 +1,7 @@
-# Appname
+# gpt4free
+
+- not need login
+- 7900 port is desktop
+- 1337 port is api
+
 ## FAQ

apps/g4f/docker-compose.yml

@@ -1,15 +1,11 @@
-# image,docs: https://hub.docker.com/_/wordpress/
+# image,docs: https://github.com/xtekky/gpt4free
 
 services:
 
-  wordpress:
+  gpt4free:
     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:
@@ -18,33 +14,22 @@ services:
     deploy:
       resources:
         limits:
-          memory: 5g
-          cpus: '0.7'
+          memory: 2g
     ports:
-      - $W9_HTTP_PORT_SET:80
+      - $W9_HTTP_PORT_SET:8080
+      #- 1337:1337  #api
+      #- 7900:7900  #desktop
     env_file: .env
     volumes:
-      - wordpress:/var/www/html
-      - ./src/php_exra.ini:/usr/local/etc/php/conf.d/php_exra.ini
+      - har_and_cookies:/app/har_and_cookies
+      - generated_images:/app/generated_images
 
-  mariadb:
-    image: mariadb:10.4
-    container_name: $W9_ID-mariadb
-    restart: unless-stopped
-    command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --innodb_log_buffer_size=30M
-    volumes:
-      - mysql_data:/var/lib/mysql
-    environment:
-      MYSQL_DATABASE: $W9_ID
-      MYSQL_USER: $W9_ID
-      MYSQL_PASSWORD: $W9_POWER_PASSWORD
-      MYSQL_ROOT_PASSWORD: $W9_POWER_PASSWORD
 
 volumes:
-  wordpress:
-  mysql_data:
+  har_and_cookies:
+  generated_images:
 
 networks:
   default:
     name: $W9_NETWORK
-    external: true
+    external: true

apps/g4f/variables.json

@@ -13,8 +13,8 @@
     }
   ],
   "requirements": {
-    "cpu": "2",
-    "memory": "4",
+    "cpu": "1",
+    "memory": "2",
     "disk": "10",
     "url": "https://github.com/xtekky/gpt4free"
   }