diff --git a/appstore/cloudreve/4.3.0/.env b/appstore/cloudreve/4.4.0/.env similarity index 100% rename from appstore/cloudreve/4.3.0/.env rename to appstore/cloudreve/4.4.0/.env diff --git a/appstore/cloudreve/4.3.0/data.yml b/appstore/cloudreve/4.4.0/data.yml similarity index 100% rename from appstore/cloudreve/4.3.0/data.yml rename to appstore/cloudreve/4.4.0/data.yml diff --git a/appstore/cloudreve/4.3.0/docker-compose.yml b/appstore/cloudreve/4.4.0/docker-compose.yml similarity index 91% rename from appstore/cloudreve/4.3.0/docker-compose.yml rename to appstore/cloudreve/4.4.0/docker-compose.yml index 010884a08..60c66b1e7 100644 --- a/appstore/cloudreve/4.3.0/docker-compose.yml +++ b/appstore/cloudreve/4.4.0/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: cloudreve/cloudreve:4.3.0 + image: cloudreve/cloudreve:4.4.0 labels: createdBy: Apps networks: diff --git a/appstore/cloudreve/4.3.0/envs/default.env b/appstore/cloudreve/4.4.0/envs/default.env similarity index 100% rename from appstore/cloudreve/4.3.0/envs/default.env rename to appstore/cloudreve/4.4.0/envs/default.env diff --git a/appstore/cloudreve/4.3.0/envs/global.env b/appstore/cloudreve/4.4.0/envs/global.env similarity index 100% rename from appstore/cloudreve/4.3.0/envs/global.env rename to appstore/cloudreve/4.4.0/envs/global.env diff --git a/appstore/cloudreve/4.3.0/scripts/init.sh b/appstore/cloudreve/4.4.0/scripts/init.sh similarity index 100% rename from appstore/cloudreve/4.3.0/scripts/init.sh rename to appstore/cloudreve/4.4.0/scripts/init.sh diff --git a/appstore/cloudreve/4.3.0/scripts/uninstall.sh b/appstore/cloudreve/4.4.0/scripts/uninstall.sh similarity index 100% rename from appstore/cloudreve/4.3.0/scripts/uninstall.sh rename to appstore/cloudreve/4.4.0/scripts/uninstall.sh diff --git a/appstore/cloudreve/4.3.0/scripts/upgrade.sh b/appstore/cloudreve/4.4.0/scripts/upgrade.sh similarity index 100% rename from appstore/cloudreve/4.3.0/scripts/upgrade.sh rename to appstore/cloudreve/4.4.0/scripts/upgrade.sh diff --git a/appstore/shopware-dockware/6.7.1.2/.env b/appstore/shopware-dockware/6.7.1.2/.env new file mode 100644 index 000000000..b4dd4db5f --- /dev/null +++ b/appstore/shopware-dockware/6.7.1.2/.env @@ -0,0 +1,3 @@ +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8080 + diff --git a/appstore/shopware/6.7.1.2/data.yml b/appstore/shopware-dockware/6.7.1.2/data.yml similarity index 53% rename from appstore/shopware/6.7.1.2/data.yml rename to appstore/shopware-dockware/6.7.1.2/data.yml index b00b757d0..482f7b275 100644 --- a/appstore/shopware/6.7.1.2/data.yml +++ b/appstore/shopware-dockware/6.7.1.2/data.yml @@ -1,12 +1,5 @@ additionalProperties: formFields: - - default: "/home/dockware" - edit: true - envKey: DOCKWARE_ROOT_PATH - labelZh: 数据持久化路径 - labelEn: Data persistence path - required: true - type: text - default: 8080 edit: true envKey: PANEL_APP_PORT_HTTP diff --git a/dockge/shopware/docker-compose.yml b/appstore/shopware-dockware/6.7.1.2/docker-compose.yml similarity index 75% rename from dockge/shopware/docker-compose.yml rename to appstore/shopware-dockware/6.7.1.2/docker-compose.yml index 72d149a1d..ab612d8de 100644 --- a/dockge/shopware/docker-compose.yml +++ b/appstore/shopware-dockware/6.7.1.2/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: dockware: - container_name: shopware + container_name: shopware-dockware env_file: - ./envs/global.env - .env @@ -25,6 +25,3 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 restart: always - volumes: - - ${DOCKWARE_ROOT_PATH}/mysql:/var/lib/mysql - - ${DOCKWARE_ROOT_PATH}/html:/var/www/html diff --git a/appstore/shopware/6.7.1.2/envs/default.env b/appstore/shopware-dockware/6.7.1.2/envs/default.env similarity index 100% rename from appstore/shopware/6.7.1.2/envs/default.env rename to appstore/shopware-dockware/6.7.1.2/envs/default.env diff --git a/appstore/shopware/6.7.1.2/envs/global.env b/appstore/shopware-dockware/6.7.1.2/envs/global.env similarity index 100% rename from appstore/shopware/6.7.1.2/envs/global.env rename to appstore/shopware-dockware/6.7.1.2/envs/global.env diff --git a/appstore/shopware/6.7.1.2/scripts/init.sh b/appstore/shopware-dockware/6.7.1.2/scripts/init.sh similarity index 100% rename from appstore/shopware/6.7.1.2/scripts/init.sh rename to appstore/shopware-dockware/6.7.1.2/scripts/init.sh diff --git a/appstore/shopware/6.7.1.2/scripts/uninstall.sh b/appstore/shopware-dockware/6.7.1.2/scripts/uninstall.sh similarity index 100% rename from appstore/shopware/6.7.1.2/scripts/uninstall.sh rename to appstore/shopware-dockware/6.7.1.2/scripts/uninstall.sh diff --git a/appstore/shopware/6.7.1.2/scripts/upgrade.sh b/appstore/shopware-dockware/6.7.1.2/scripts/upgrade.sh similarity index 100% rename from appstore/shopware/6.7.1.2/scripts/upgrade.sh rename to appstore/shopware-dockware/6.7.1.2/scripts/upgrade.sh diff --git a/appstore/shopware/README.md b/appstore/shopware-dockware/README.md similarity index 95% rename from appstore/shopware/README.md rename to appstore/shopware-dockware/README.md index 20c773802..99586861b 100644 --- a/appstore/shopware/README.md +++ b/appstore/shopware-dockware/README.md @@ -37,6 +37,8 @@ Shopware 6 是一个开放的无头商务平台 > Host: localhost > > Port: 1025 +> +> ## 该版本无法持久化数据！！！ ## 简介 diff --git a/appstore/shopware/data.yml b/appstore/shopware-dockware/data.yml similarity index 83% rename from appstore/shopware/data.yml rename to appstore/shopware-dockware/data.yml index 85671129a..5837d6848 100644 --- a/appstore/shopware/data.yml +++ b/appstore/shopware-dockware/data.yml @@ -1,6 +1,6 @@ additionalProperties: - key: shopware - name: ShopWare + key: shopware-dockware + name: ShopWare (Dockware版) tags: - WebSite - Local diff --git a/appstore/shopware/logo.png b/appstore/shopware-dockware/logo.png similarity index 100% rename from appstore/shopware/logo.png rename to appstore/shopware-dockware/logo.png diff --git a/appstore/shopware/logo.svg b/appstore/shopware-dockware/logo.svg similarity index 100% rename from appstore/shopware/logo.svg rename to appstore/shopware-dockware/logo.svg diff --git a/appstore/shopware/6.7.1.2/.env b/appstore/shopware/6.7.1.2/.env deleted file mode 100644 index 3ab96a737..000000000 --- a/appstore/shopware/6.7.1.2/.env +++ /dev/null @@ -1,6 +0,0 @@ -# 数据持久化路径 [必填] -DOCKWARE_ROOT_PATH=/home/dockware - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8080 - diff --git a/dockge/cloudreve/docker-compose.yml b/dockge/cloudreve/docker-compose.yml index 010884a08..60c66b1e7 100644 --- a/dockge/cloudreve/docker-compose.yml +++ b/dockge/cloudreve/docker-compose.yml @@ -9,7 +9,7 @@ services: - .env environment: - TZ=Asia/Shanghai - image: cloudreve/cloudreve:4.3.0 + image: cloudreve/cloudreve:4.4.0 labels: createdBy: Apps networks: diff --git a/dockge/shopware-dockware/.env b/dockge/shopware-dockware/.env new file mode 100644 index 000000000..b4dd4db5f --- /dev/null +++ b/dockge/shopware-dockware/.env @@ -0,0 +1,3 @@ +# WebUI 端口 [必填] +PANEL_APP_PORT_HTTP=8080 + diff --git a/appstore/shopware/6.7.1.2/docker-compose.yml b/dockge/shopware-dockware/docker-compose.yml similarity index 75% rename from appstore/shopware/6.7.1.2/docker-compose.yml rename to dockge/shopware-dockware/docker-compose.yml index 72d149a1d..ab612d8de 100644 --- a/appstore/shopware/6.7.1.2/docker-compose.yml +++ b/dockge/shopware-dockware/docker-compose.yml @@ -3,7 +3,7 @@ networks: external: true services: dockware: - container_name: shopware + container_name: shopware-dockware env_file: - ./envs/global.env - .env @@ -25,6 +25,3 @@ services: ports: - ${PANEL_APP_PORT_HTTP}:80 restart: always - volumes: - - ${DOCKWARE_ROOT_PATH}/mysql:/var/lib/mysql - - ${DOCKWARE_ROOT_PATH}/html:/var/www/html diff --git a/dockge/shopware/envs/default.env b/dockge/shopware-dockware/envs/default.env similarity index 100% rename from dockge/shopware/envs/default.env rename to dockge/shopware-dockware/envs/default.env diff --git a/dockge/shopware/envs/global.env b/dockge/shopware-dockware/envs/global.env similarity index 100% rename from dockge/shopware/envs/global.env rename to dockge/shopware-dockware/envs/global.env diff --git a/dockge/shopware/.env b/dockge/shopware/.env deleted file mode 100644 index 3ab96a737..000000000 --- a/dockge/shopware/.env +++ /dev/null @@ -1,6 +0,0 @@ -# 数据持久化路径 [必填] -DOCKWARE_ROOT_PATH=/home/dockware - -# WebUI 端口 [必填] -PANEL_APP_PORT_HTTP=8080 -