From aaab1d6d706d09ea8bfcf258f6689ad71e245737 Mon Sep 17 00:00:00 2001 From: filesite Date: Thu, 9 Jan 2025 08:08:26 +0800 Subject: [PATCH] compose config file update --- README.md | 14 ++++++++++++++ compose.yaml | 2 -- themes/beauty/controller/CommandController.php | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7cdef82..cd8f7bd 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,20 @@ Machete是单入口模式PHP源码,**不支持子目录方式访问**,以下 | 导航站 | 站长手册 | WebDir | +## 基于Docker Compose部署 + +如果你已经安装了Docker Desktop,并确认已经支持docker compose命令,可使用以下命令进行安装: + +``` +docker compose build +docker compose up -d +``` + +如果你是在支持docker compose的NAS系统里安装,请参考下面配置: +[Docker Compose配置参考](./compose.yaml) + + + ## 基于Docker部署 在Docker中如何用filesite/machete源码快速搭建支持文件/目录管理内容的图片网站、视频网站、导航网站和文档站的视频教程。 diff --git a/compose.yaml b/compose.yaml index 3479ed9..caccfb9 100644 --- a/compose.yaml +++ b/compose.yaml @@ -10,8 +10,6 @@ name: filesite_machete services: web: build: . - # upgrade to latest version - command: /var/www/machete/bin/upgrade.sh ports: - "1080:80" image: "filesite/machete:latest" diff --git a/themes/beauty/controller/CommandController.php b/themes/beauty/controller/CommandController.php index 65d3eb7..78259c9 100644 --- a/themes/beauty/controller/CommandController.php +++ b/themes/beauty/controller/CommandController.php @@ -503,7 +503,7 @@ eof; $cacheData[$dirId]['image_total'] = $imgNum; $cacheData[$dirId]['video_total'] = $videoNum; $cacheData[$dirId]['audio_total'] = $audioNum; - echo "File total: {$dirId}: image {$imgNum}, video {$videoNum}, audio {$audioNum}\n"; + echo "File total: image {$imgNum}, video {$videoNum}, audio {$audioNum}\n"; //更新所有父目录数据 $parentDir = $this->getParentDir($dirpath);