From 4ce6d185a8f8862e3a44047aa1b365cd42bb1440 Mon Sep 17 00:00:00 2001 From: QYG2297248353 Date: Tue, 18 Feb 2025 06:26:56 +0000 Subject: [PATCH] Processed apps directory via GitHub Actions --- appstore/dify/{0.15.3 => 1.0.0}/.env | 4 ++-- appstore/dify/{0.15.3 => 1.0.0}/conf/certbot/README.md | 0 .../dify/{0.15.3 => 1.0.0}/conf/certbot/docker-entrypoint.sh | 0 .../{0.15.3 => 1.0.0}/conf/certbot/update-cert.template.txt | 0 .../dify/{0.15.3 => 1.0.0}/conf/couchbase-server/Dockerfile | 0 .../{0.15.3 => 1.0.0}/conf/couchbase-server/init-cbserver.sh | 0 .../{0.15.3 => 1.0.0}/conf/elasticsearch/docker-entrypoint.sh | 0 .../{0.15.3 => 1.0.0}/conf/nginx/conf.d/default.conf.template | 0 .../dify/{0.15.3 => 1.0.0}/conf/nginx/docker-entrypoint.sh | 0 .../dify/{0.15.3 => 1.0.0}/conf/nginx/https.conf.template | 0 .../dify/{0.15.3 => 1.0.0}/conf/nginx/nginx.conf.template | 0 .../dify/{0.15.3 => 1.0.0}/conf/nginx/proxy.conf.template | 0 appstore/dify/{0.15.3 => 1.0.0}/conf/nginx/ssl/.gitkeep | 0 .../{0.15.3 => 1.0.0}/conf/ssrf_proxy/docker-entrypoint.sh | 0 .../{0.15.3 => 1.0.0}/conf/ssrf_proxy/squid.conf.template | 0 appstore/dify/{0.15.3 => 1.0.0}/conf/startupscripts/init.sh | 0 .../{0.15.3 => 1.0.0}/conf/startupscripts/init_user.script | 0 appstore/dify/{0.15.3 => 1.0.0}/conf/tidb/config/pd.toml | 0 .../{0.15.3 => 1.0.0}/conf/tidb/config/tiflash-learner.toml | 0 appstore/dify/{0.15.3 => 1.0.0}/conf/tidb/config/tiflash.toml | 0 appstore/dify/{0.15.3 => 1.0.0}/conf/tidb/docker-compose.yaml | 0 .../volumes/myscale/config/users.d/custom_users_config.xml | 0 .../conf/volumes/oceanbase/init.d/vec_memory.sql | 0 .../conf/volumes/opensearch/opensearch_dashboards.yml | 0 .../{0.15.3 => 1.0.0}/conf/volumes/sandbox/conf/config.yaml | 0 .../conf/volumes/sandbox/conf/config.yaml.example | 0 .../conf/volumes/sandbox/dependencies/python-requirements.txt | 0 appstore/dify/{0.15.3 => 1.0.0}/data.yml | 4 ++-- appstore/dify/{0.15.3 => 1.0.0}/docker-compose.yml | 2 +- appstore/dify/{0.15.3 => 1.0.0}/envs/default.env | 0 appstore/dify/{0.15.3 => 1.0.0}/envs/dify.env | 0 appstore/dify/{0.15.3 => 1.0.0}/envs/global.env | 0 appstore/dify/{0.15.3 => 1.0.0}/scripts/init.sh | 0 appstore/dify/{0.15.3 => 1.0.0}/scripts/uninstall.sh | 0 appstore/dify/{0.15.3 => 1.0.0}/scripts/upgrade.sh | 0 dockge/dify/.env | 4 ++-- dockge/dify/docker-compose.yml | 2 +- 37 files changed, 8 insertions(+), 8 deletions(-) rename appstore/dify/{0.15.3 => 1.0.0}/.env (92%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/certbot/README.md (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/certbot/docker-entrypoint.sh (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/certbot/update-cert.template.txt (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/couchbase-server/Dockerfile (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/couchbase-server/init-cbserver.sh (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/elasticsearch/docker-entrypoint.sh (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/nginx/conf.d/default.conf.template (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/nginx/docker-entrypoint.sh (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/nginx/https.conf.template (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/nginx/nginx.conf.template (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/nginx/proxy.conf.template (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/nginx/ssl/.gitkeep (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/ssrf_proxy/docker-entrypoint.sh (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/ssrf_proxy/squid.conf.template (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/startupscripts/init.sh (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/startupscripts/init_user.script (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/tidb/config/pd.toml (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/tidb/config/tiflash-learner.toml (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/tidb/config/tiflash.toml (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/tidb/docker-compose.yaml (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/volumes/myscale/config/users.d/custom_users_config.xml (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/volumes/oceanbase/init.d/vec_memory.sql (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/volumes/opensearch/opensearch_dashboards.yml (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/volumes/sandbox/conf/config.yaml (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/volumes/sandbox/conf/config.yaml.example (100%) rename appstore/dify/{0.15.3 => 1.0.0}/conf/volumes/sandbox/dependencies/python-requirements.txt (100%) rename appstore/dify/{0.15.3 => 1.0.0}/data.yml (98%) rename appstore/dify/{0.15.3 => 1.0.0}/docker-compose.yml (99%) rename appstore/dify/{0.15.3 => 1.0.0}/envs/default.env (100%) rename appstore/dify/{0.15.3 => 1.0.0}/envs/dify.env (100%) rename appstore/dify/{0.15.3 => 1.0.0}/envs/global.env (100%) rename appstore/dify/{0.15.3 => 1.0.0}/scripts/init.sh (100%) rename appstore/dify/{0.15.3 => 1.0.0}/scripts/uninstall.sh (100%) rename appstore/dify/{0.15.3 => 1.0.0}/scripts/upgrade.sh (100%) diff --git a/appstore/dify/0.15.3/.env b/appstore/dify/1.0.0/.env similarity index 92% rename from appstore/dify/0.15.3/.env rename to appstore/dify/1.0.0/.env index 68b42113..6e536463 100644 --- a/appstore/dify/0.15.3/.env +++ b/appstore/dify/1.0.0/.env @@ -23,8 +23,8 @@ MILVUS_STANDALONE_SERVER_PORT=9091 MYSCALE_PORT=8123 # Elasticsearch 端口 [必填] -ELASTICSEARCH_PORT=8123 +ELASTICSEARCH_PORT=9200 # Kibana 端口 [必填] -KIBANA_PORT=8123 +KIBANA_PORT=5601 diff --git a/appstore/dify/0.15.3/conf/certbot/README.md b/appstore/dify/1.0.0/conf/certbot/README.md similarity index 100% rename from appstore/dify/0.15.3/conf/certbot/README.md rename to appstore/dify/1.0.0/conf/certbot/README.md diff --git a/appstore/dify/0.15.3/conf/certbot/docker-entrypoint.sh b/appstore/dify/1.0.0/conf/certbot/docker-entrypoint.sh similarity index 100% rename from appstore/dify/0.15.3/conf/certbot/docker-entrypoint.sh rename to appstore/dify/1.0.0/conf/certbot/docker-entrypoint.sh diff --git a/appstore/dify/0.15.3/conf/certbot/update-cert.template.txt b/appstore/dify/1.0.0/conf/certbot/update-cert.template.txt similarity index 100% rename from appstore/dify/0.15.3/conf/certbot/update-cert.template.txt rename to appstore/dify/1.0.0/conf/certbot/update-cert.template.txt diff --git a/appstore/dify/0.15.3/conf/couchbase-server/Dockerfile b/appstore/dify/1.0.0/conf/couchbase-server/Dockerfile similarity index 100% rename from appstore/dify/0.15.3/conf/couchbase-server/Dockerfile rename to appstore/dify/1.0.0/conf/couchbase-server/Dockerfile diff --git a/appstore/dify/0.15.3/conf/couchbase-server/init-cbserver.sh b/appstore/dify/1.0.0/conf/couchbase-server/init-cbserver.sh similarity index 100% rename from appstore/dify/0.15.3/conf/couchbase-server/init-cbserver.sh rename to appstore/dify/1.0.0/conf/couchbase-server/init-cbserver.sh diff --git a/appstore/dify/0.15.3/conf/elasticsearch/docker-entrypoint.sh b/appstore/dify/1.0.0/conf/elasticsearch/docker-entrypoint.sh similarity index 100% rename from appstore/dify/0.15.3/conf/elasticsearch/docker-entrypoint.sh rename to appstore/dify/1.0.0/conf/elasticsearch/docker-entrypoint.sh diff --git a/appstore/dify/0.15.3/conf/nginx/conf.d/default.conf.template b/appstore/dify/1.0.0/conf/nginx/conf.d/default.conf.template similarity index 100% rename from appstore/dify/0.15.3/conf/nginx/conf.d/default.conf.template rename to appstore/dify/1.0.0/conf/nginx/conf.d/default.conf.template diff --git a/appstore/dify/0.15.3/conf/nginx/docker-entrypoint.sh b/appstore/dify/1.0.0/conf/nginx/docker-entrypoint.sh similarity index 100% rename from appstore/dify/0.15.3/conf/nginx/docker-entrypoint.sh rename to appstore/dify/1.0.0/conf/nginx/docker-entrypoint.sh diff --git a/appstore/dify/0.15.3/conf/nginx/https.conf.template b/appstore/dify/1.0.0/conf/nginx/https.conf.template similarity index 100% rename from appstore/dify/0.15.3/conf/nginx/https.conf.template rename to appstore/dify/1.0.0/conf/nginx/https.conf.template diff --git a/appstore/dify/0.15.3/conf/nginx/nginx.conf.template b/appstore/dify/1.0.0/conf/nginx/nginx.conf.template similarity index 100% rename from appstore/dify/0.15.3/conf/nginx/nginx.conf.template rename to appstore/dify/1.0.0/conf/nginx/nginx.conf.template diff --git a/appstore/dify/0.15.3/conf/nginx/proxy.conf.template b/appstore/dify/1.0.0/conf/nginx/proxy.conf.template similarity index 100% rename from appstore/dify/0.15.3/conf/nginx/proxy.conf.template rename to appstore/dify/1.0.0/conf/nginx/proxy.conf.template diff --git a/appstore/dify/0.15.3/conf/nginx/ssl/.gitkeep b/appstore/dify/1.0.0/conf/nginx/ssl/.gitkeep similarity index 100% rename from appstore/dify/0.15.3/conf/nginx/ssl/.gitkeep rename to appstore/dify/1.0.0/conf/nginx/ssl/.gitkeep diff --git a/appstore/dify/0.15.3/conf/ssrf_proxy/docker-entrypoint.sh b/appstore/dify/1.0.0/conf/ssrf_proxy/docker-entrypoint.sh similarity index 100% rename from appstore/dify/0.15.3/conf/ssrf_proxy/docker-entrypoint.sh rename to appstore/dify/1.0.0/conf/ssrf_proxy/docker-entrypoint.sh diff --git a/appstore/dify/0.15.3/conf/ssrf_proxy/squid.conf.template b/appstore/dify/1.0.0/conf/ssrf_proxy/squid.conf.template similarity index 100% rename from appstore/dify/0.15.3/conf/ssrf_proxy/squid.conf.template rename to appstore/dify/1.0.0/conf/ssrf_proxy/squid.conf.template diff --git a/appstore/dify/0.15.3/conf/startupscripts/init.sh b/appstore/dify/1.0.0/conf/startupscripts/init.sh similarity index 100% rename from appstore/dify/0.15.3/conf/startupscripts/init.sh rename to appstore/dify/1.0.0/conf/startupscripts/init.sh diff --git a/appstore/dify/0.15.3/conf/startupscripts/init_user.script b/appstore/dify/1.0.0/conf/startupscripts/init_user.script similarity index 100% rename from appstore/dify/0.15.3/conf/startupscripts/init_user.script rename to appstore/dify/1.0.0/conf/startupscripts/init_user.script diff --git a/appstore/dify/0.15.3/conf/tidb/config/pd.toml b/appstore/dify/1.0.0/conf/tidb/config/pd.toml similarity index 100% rename from appstore/dify/0.15.3/conf/tidb/config/pd.toml rename to appstore/dify/1.0.0/conf/tidb/config/pd.toml diff --git a/appstore/dify/0.15.3/conf/tidb/config/tiflash-learner.toml b/appstore/dify/1.0.0/conf/tidb/config/tiflash-learner.toml similarity index 100% rename from appstore/dify/0.15.3/conf/tidb/config/tiflash-learner.toml rename to appstore/dify/1.0.0/conf/tidb/config/tiflash-learner.toml diff --git a/appstore/dify/0.15.3/conf/tidb/config/tiflash.toml b/appstore/dify/1.0.0/conf/tidb/config/tiflash.toml similarity index 100% rename from appstore/dify/0.15.3/conf/tidb/config/tiflash.toml rename to appstore/dify/1.0.0/conf/tidb/config/tiflash.toml diff --git a/appstore/dify/0.15.3/conf/tidb/docker-compose.yaml b/appstore/dify/1.0.0/conf/tidb/docker-compose.yaml similarity index 100% rename from appstore/dify/0.15.3/conf/tidb/docker-compose.yaml rename to appstore/dify/1.0.0/conf/tidb/docker-compose.yaml diff --git a/appstore/dify/0.15.3/conf/volumes/myscale/config/users.d/custom_users_config.xml b/appstore/dify/1.0.0/conf/volumes/myscale/config/users.d/custom_users_config.xml similarity index 100% rename from appstore/dify/0.15.3/conf/volumes/myscale/config/users.d/custom_users_config.xml rename to appstore/dify/1.0.0/conf/volumes/myscale/config/users.d/custom_users_config.xml diff --git a/appstore/dify/0.15.3/conf/volumes/oceanbase/init.d/vec_memory.sql b/appstore/dify/1.0.0/conf/volumes/oceanbase/init.d/vec_memory.sql similarity index 100% rename from appstore/dify/0.15.3/conf/volumes/oceanbase/init.d/vec_memory.sql rename to appstore/dify/1.0.0/conf/volumes/oceanbase/init.d/vec_memory.sql diff --git a/appstore/dify/0.15.3/conf/volumes/opensearch/opensearch_dashboards.yml b/appstore/dify/1.0.0/conf/volumes/opensearch/opensearch_dashboards.yml similarity index 100% rename from appstore/dify/0.15.3/conf/volumes/opensearch/opensearch_dashboards.yml rename to appstore/dify/1.0.0/conf/volumes/opensearch/opensearch_dashboards.yml diff --git a/appstore/dify/0.15.3/conf/volumes/sandbox/conf/config.yaml b/appstore/dify/1.0.0/conf/volumes/sandbox/conf/config.yaml similarity index 100% rename from appstore/dify/0.15.3/conf/volumes/sandbox/conf/config.yaml rename to appstore/dify/1.0.0/conf/volumes/sandbox/conf/config.yaml diff --git a/appstore/dify/0.15.3/conf/volumes/sandbox/conf/config.yaml.example b/appstore/dify/1.0.0/conf/volumes/sandbox/conf/config.yaml.example similarity index 100% rename from appstore/dify/0.15.3/conf/volumes/sandbox/conf/config.yaml.example rename to appstore/dify/1.0.0/conf/volumes/sandbox/conf/config.yaml.example diff --git a/appstore/dify/0.15.3/conf/volumes/sandbox/dependencies/python-requirements.txt b/appstore/dify/1.0.0/conf/volumes/sandbox/dependencies/python-requirements.txt similarity index 100% rename from appstore/dify/0.15.3/conf/volumes/sandbox/dependencies/python-requirements.txt rename to appstore/dify/1.0.0/conf/volumes/sandbox/dependencies/python-requirements.txt diff --git a/appstore/dify/0.15.3/data.yml b/appstore/dify/1.0.0/data.yml similarity index 98% rename from appstore/dify/0.15.3/data.yml rename to appstore/dify/1.0.0/data.yml index 97345c43..b6cfca44 100644 --- a/appstore/dify/0.15.3/data.yml +++ b/appstore/dify/1.0.0/data.yml @@ -64,7 +64,7 @@ additionalProperties: required: true rule: paramPort type: number - - default: 8123 + - default: 9200 edit: true envKey: ELASTICSEARCH_PORT labelZh: Elasticsearch 端口 @@ -72,7 +72,7 @@ additionalProperties: required: true rule: paramPort type: number - - default: 8123 + - default: 5601 edit: true envKey: KIBANA_PORT labelZh: Kibana 端口 diff --git a/appstore/dify/0.15.3/docker-compose.yml b/appstore/dify/1.0.0/docker-compose.yml similarity index 99% rename from appstore/dify/0.15.3/docker-compose.yml rename to appstore/dify/1.0.0/docker-compose.yml index d16eca10..95196cb7 100644 --- a/appstore/dify/0.15.3/docker-compose.yml +++ b/appstore/dify/1.0.0/docker-compose.yml @@ -462,7 +462,7 @@ services: volumes: - ${DIFY_ROOT_PATH}/volumes/chroma:/chroma/chroma couchbase-server: - build: ./couchbase-server + build: ./conf/couchbase-server command: sh -c "/opt/couchbase/init/init-cbserver.sh" container_name: couchbase-server entrypoint: diff --git a/appstore/dify/0.15.3/envs/default.env b/appstore/dify/1.0.0/envs/default.env similarity index 100% rename from appstore/dify/0.15.3/envs/default.env rename to appstore/dify/1.0.0/envs/default.env diff --git a/appstore/dify/0.15.3/envs/dify.env b/appstore/dify/1.0.0/envs/dify.env similarity index 100% rename from appstore/dify/0.15.3/envs/dify.env rename to appstore/dify/1.0.0/envs/dify.env diff --git a/appstore/dify/0.15.3/envs/global.env b/appstore/dify/1.0.0/envs/global.env similarity index 100% rename from appstore/dify/0.15.3/envs/global.env rename to appstore/dify/1.0.0/envs/global.env diff --git a/appstore/dify/0.15.3/scripts/init.sh b/appstore/dify/1.0.0/scripts/init.sh similarity index 100% rename from appstore/dify/0.15.3/scripts/init.sh rename to appstore/dify/1.0.0/scripts/init.sh diff --git a/appstore/dify/0.15.3/scripts/uninstall.sh b/appstore/dify/1.0.0/scripts/uninstall.sh similarity index 100% rename from appstore/dify/0.15.3/scripts/uninstall.sh rename to appstore/dify/1.0.0/scripts/uninstall.sh diff --git a/appstore/dify/0.15.3/scripts/upgrade.sh b/appstore/dify/1.0.0/scripts/upgrade.sh similarity index 100% rename from appstore/dify/0.15.3/scripts/upgrade.sh rename to appstore/dify/1.0.0/scripts/upgrade.sh diff --git a/dockge/dify/.env b/dockge/dify/.env index 68b42113..6e536463 100644 --- a/dockge/dify/.env +++ b/dockge/dify/.env @@ -23,8 +23,8 @@ MILVUS_STANDALONE_SERVER_PORT=9091 MYSCALE_PORT=8123 # Elasticsearch 端口 [必填] -ELASTICSEARCH_PORT=8123 +ELASTICSEARCH_PORT=9200 # Kibana 端口 [必填] -KIBANA_PORT=8123 +KIBANA_PORT=5601 diff --git a/dockge/dify/docker-compose.yml b/dockge/dify/docker-compose.yml index d16eca10..95196cb7 100644 --- a/dockge/dify/docker-compose.yml +++ b/dockge/dify/docker-compose.yml @@ -462,7 +462,7 @@ services: volumes: - ${DIFY_ROOT_PATH}/volumes/chroma:/chroma/chroma couchbase-server: - build: ./couchbase-server + build: ./conf/couchbase-server command: sh -c "/opt/couchbase/init/init-cbserver.sh" container_name: couchbase-server entrypoint: