From ac295db10d856b08de7a2c7a3f01a0b4b7eeb272 Mon Sep 17 00:00:00 2001 From: websoft9 Date: Thu, 9 Jan 2025 04:37:40 +0000 Subject: [PATCH] Update g4f --- apps/g4f/.env | 52 ++++------------------- apps/g4f/Dockerfile | 21 ---------- apps/g4f/Notes.md | 7 +++- apps/g4f/docker-compose.yml | 37 +++++------------ apps/g4f/src/after_up.sh | 1 - apps/g4f/src/encrypt.sh | 12 ------ apps/g4f/src/filelist | 3 -- apps/g4f/src/get_version.sh | 1 - apps/g4f/src/nginx-proxy.conf.template | 57 -------------------------- apps/g4f/src/php_exra.ini | 8 ---- apps/g4f/src/replace_url.sh | 1 - apps/g4f/variables.json | 4 +- 12 files changed, 28 insertions(+), 176 deletions(-) delete mode 100644 apps/g4f/Dockerfile delete mode 100644 apps/g4f/src/after_up.sh delete mode 100644 apps/g4f/src/encrypt.sh delete mode 100644 apps/g4f/src/filelist delete mode 100644 apps/g4f/src/get_version.sh delete mode 100644 apps/g4f/src/nginx-proxy.conf.template delete mode 100644 apps/g4f/src/php_exra.ini delete mode 100644 apps/g4f/src/replace_url.sh diff --git a/apps/g4f/.env b/apps/g4f/.env index 7432d267c..defe89550 100644 --- a/apps/g4f/.env +++ b/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="" \ No newline at end of file +# Below environment is created by this app: https://hub.docker.com/r/hlohaus789/g4f diff --git a/apps/g4f/Dockerfile b/apps/g4f/Dockerfile deleted file mode 100644 index 4364b46fb..000000000 --- a/apps/g4f/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# image: https://hub.docker.com/r/websoft9dev/discuzq - -FROM ccr.ccs.tencentyun.com/discuzq/dzq:latest - -LABEL org.opencontainers.image.authors="https://www.websoft9.com" \ - org.opencontainers.image.description="Application packaged by Websoft9" \ - org.opencontainers.image.source="https://github.com/Websoft9/docker-library/tree/main/apps/opencart" \ - org.opencontainers.image.title="OpenCart" \ - org.opencontainers.image.vendor="Websoft9 Inc." \ - org.opencontainers.image.version="4.0.1.1" - -ENV DISCUZQ_MYSQL_HOST=mysql -ENV DISCUZQ_MYSQL_USER=discuzq -ENV DISCUZQ_MYSQL_PASSWORD=discuzq -ENV DISCUZQ_MYSQL_DATABASE=discuzq -ENV DISCUZQ_SITENAME=DiscuzQ - -COPY cmd.sh /tmp -RUN chmod +x /tmp/cmd.sh - -CMD ["/tmp/cmd.sh"] diff --git a/apps/g4f/Notes.md b/apps/g4f/Notes.md index 1fdbbb29d..77d0d784b 100644 --- a/apps/g4f/Notes.md +++ b/apps/g4f/Notes.md @@ -1,2 +1,7 @@ -# Appname +# gpt4free + +- not need login +- 7900 port is desktop +- 1337 port is api + ## FAQ diff --git a/apps/g4f/docker-compose.yml b/apps/g4f/docker-compose.yml index b501aed86..f8e25f98f 100644 --- a/apps/g4f/docker-compose.yml +++ b/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 \ No newline at end of file diff --git a/apps/g4f/src/after_up.sh b/apps/g4f/src/after_up.sh deleted file mode 100644 index 8b1378917..000000000 --- a/apps/g4f/src/after_up.sh +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/g4f/src/encrypt.sh b/apps/g4f/src/encrypt.sh deleted file mode 100644 index 2939685f7..000000000 --- a/apps/g4f/src/encrypt.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin -clear - - - -# Add encrypt script below if use W9_ENCRYPT_PASSWORD at .env file -# ------------- start ------------------------- - - - -# ------------- end --------------------------- diff --git a/apps/g4f/src/filelist b/apps/g4f/src/filelist deleted file mode 100644 index 341240aed..000000000 --- a/apps/g4f/src/filelist +++ /dev/null @@ -1,3 +0,0 @@ -docker-compose.yml -script/test.sh -docker \ No newline at end of file diff --git a/apps/g4f/src/get_version.sh b/apps/g4f/src/get_version.sh deleted file mode 100644 index 8b1378917..000000000 --- a/apps/g4f/src/get_version.sh +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/g4f/src/nginx-proxy.conf.template b/apps/g4f/src/nginx-proxy.conf.template deleted file mode 100644 index 951364ffe..000000000 --- a/apps/g4f/src/nginx-proxy.conf.template +++ /dev/null @@ -1,57 +0,0 @@ -proxy_busy_buffers_size 512k; -proxy_buffers 4 512k; -proxy_buffer_size 256k; -client_max_body_size 50m; -# override default location / -location / { - add_header X-Served-By $host; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-Scheme $scheme; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Real-IP $remote_addr; - proxy_pass $forward_scheme://$server:$port$request_uri; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection upgrade; - } - -location /console { - proxy_pass http://$server:8080; - proxy_http_version 1.1; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; -} - -# for echo some useful information -location / { - default_type text/plain; - return 200 'Hello World'; -} - -location /oida/ { -# this is the address and port of the ORDS installation -proxy_pass http://127.0.0.1:8080/ords/; - -# set Origin to blank to avoid Chrome problems with CORS -proxy_set_header Origin "" ; - -# pass along some header variables with the public host name/port/and so on -proxy_set_header Host $host; -proxy_set_header X-Forwarded-Host $host:$server_port; -proxy_set_header X-Real-IP $remote_addr; -proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -proxy_set_header X-Forwarded-Proto $scheme; - -# this reverse proxies any "location" headers being passed in the response -proxy_redirect http://$host/ords/ https://$host/oida/; - -# also tell cookies their public path -proxy_cookie_path /ords/ /oida/; - -# reverse proxy links included in response (ie from ORDS webservice) -sub_filter_types application/json ; -sub_filter http://$host/ords/ https://$host/oida/; -sub_filter_once off; -} diff --git a/apps/g4f/src/php_exra.ini b/apps/g4f/src/php_exra.ini deleted file mode 100644 index b253d5718..000000000 --- a/apps/g4f/src/php_exra.ini +++ /dev/null @@ -1,8 +0,0 @@ -file_uploads = On -max_input_time = 800 -max_execution_time = 300 -memory_limit = 600M -upload_max_filesize = 900M -post_max_size = 900M -max_file_uploads = 200 -error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT \ No newline at end of file diff --git a/apps/g4f/src/replace_url.sh b/apps/g4f/src/replace_url.sh deleted file mode 100644 index f737258b3..000000000 --- a/apps/g4f/src/replace_url.sh +++ /dev/null @@ -1 +0,0 @@ -# some application have write url to database or config file, once replaced url at .env, it should replace it at config file or database \ No newline at end of file diff --git a/apps/g4f/variables.json b/apps/g4f/variables.json index 15af87332..5e3186247 100644 --- a/apps/g4f/variables.json +++ b/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" }