diff --git a/Dockerfile b/Dockerfile index bdb553f..41d26fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,10 +25,10 @@ VOLUME /var/www/html/storage # 暴露 Nginx 端口 EXPOSE 8000 -RUN chmod +x /var/www/html/docker/run.sh +RUN chmod +x /var/www/html/source/docker/run.sh # 启动 Nginx PHP 然后阻塞 -ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"] +ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"] CMD ["server"] diff --git a/extend/base/admin/service/AdminUpdateServiceBase.php b/extend/base/admin/service/AdminUpdateServiceBase.php index 5281090..d0ad575 100644 --- a/extend/base/admin/service/AdminUpdateServiceBase.php +++ b/extend/base/admin/service/AdminUpdateServiceBase.php @@ -361,7 +361,7 @@ class AdminUpdateServiceBase 'app', 'config', 'route', - 'docker', + 'source/docker', ]; foreach ($optional_files_prefix as $prefix) { diff --git a/source/README.md b/source/README.md index 08a15b6..d67dc6d 100644 --- a/source/README.md +++ b/source/README.md @@ -9,7 +9,7 @@ - `source/assets/fonts/` - `source/docs/`:项目资料(说明文档、流程文档、交付文档等) - `source/attachments/`:附件与素材(非代码交付物、原始文件等) -- `source/docker/`:附属服务/可选服务编排与开发辅助(与根目录 `docker/` 区分) +- `source/docker/`:本项目 Docker 运行所需的配置文件(nginx、PHP、PHP-FPM、启动脚本) - `source/clients/`:各端前端/客户端工程 - `source/clients/uniapp/`:uni-app(Vue3 + Vite + JavaScript) - `source/clients/vue-screen/`:预留“大屏端”目录 diff --git a/source/docker/.gitkeep b/source/docker/.gitkeep deleted file mode 100644 index 8b13789..0000000 --- a/source/docker/.gitkeep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/docker/nginx.conf b/source/docker/nginx.conf similarity index 100% rename from docker/nginx.conf rename to source/docker/nginx.conf diff --git a/docker/run.sh b/source/docker/run.sh similarity index 85% rename from docker/run.sh rename to source/docker/run.sh index ca64e93..5ee4601 100644 --- a/docker/run.sh +++ b/source/docker/run.sh @@ -1,12 +1,12 @@ #!/bin/bash # 将代码中的nginx复制到nginx配置文件中 -cp /var/www/html/docker/nginx.conf /etc/nginx/sites-available/default +cp /var/www/html/source/docker/nginx.conf /etc/nginx/sites-available/default ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default # 将代码中的php配置文件复制到php配置文件中 -cp /var/www/html/docker/zz-phprun.ini /usr/local/etc/php/conf.d -cp /var/www/html/docker/zz-phpfpm.conf /usr/local/etc/php-fpm.d +cp /var/www/html/source/docker/zz-phprun.ini /usr/local/etc/php/conf.d +cp /var/www/html/source/docker/zz-phpfpm.conf /usr/local/etc/php-fpm.d # 设置目录权限,确保挂载卷后依然有效 diff --git a/docker/zz-phpfpm.conf b/source/docker/zz-phpfpm.conf similarity index 100% rename from docker/zz-phpfpm.conf rename to source/docker/zz-phpfpm.conf diff --git a/docker/zz-phprun.ini b/source/docker/zz-phprun.ini similarity index 100% rename from docker/zz-phprun.ini rename to source/docker/zz-phprun.ini diff --git a/source/stack/base-build/Dockerfile b/source/stack/base-build/Dockerfile index ec2b47f..51a33a2 100644 --- a/source/stack/base-build/Dockerfile +++ b/source/stack/base-build/Dockerfile @@ -25,9 +25,9 @@ VOLUME /var/www/html/storage # 暴露 Nginx 端口 EXPOSE 8000 -RUN chmod +x /var/www/html/docker/run.sh +RUN chmod +x /var/www/html/source/docker/run.sh # 启动 Nginx PHP 然后阻塞 -ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"] +ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"] CMD ["server"] diff --git a/source/stack/default/Dockerfile b/source/stack/default/Dockerfile index bdb553f..41d26fe 100644 --- a/source/stack/default/Dockerfile +++ b/source/stack/default/Dockerfile @@ -25,10 +25,10 @@ VOLUME /var/www/html/storage # 暴露 Nginx 端口 EXPOSE 8000 -RUN chmod +x /var/www/html/docker/run.sh +RUN chmod +x /var/www/html/source/docker/run.sh # 启动 Nginx PHP 然后阻塞 -ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"] +ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"] CMD ["server"] diff --git a/source/stack/default/docker/run.sh b/source/stack/default/source/docker/run.sh similarity index 85% rename from source/stack/default/docker/run.sh rename to source/stack/default/source/docker/run.sh index ca64e93..5ee4601 100644 --- a/source/stack/default/docker/run.sh +++ b/source/stack/default/source/docker/run.sh @@ -1,12 +1,12 @@ #!/bin/bash # 将代码中的nginx复制到nginx配置文件中 -cp /var/www/html/docker/nginx.conf /etc/nginx/sites-available/default +cp /var/www/html/source/docker/nginx.conf /etc/nginx/sites-available/default ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default # 将代码中的php配置文件复制到php配置文件中 -cp /var/www/html/docker/zz-phprun.ini /usr/local/etc/php/conf.d -cp /var/www/html/docker/zz-phpfpm.conf /usr/local/etc/php-fpm.d +cp /var/www/html/source/docker/zz-phprun.ini /usr/local/etc/php/conf.d +cp /var/www/html/source/docker/zz-phpfpm.conf /usr/local/etc/php-fpm.d # 设置目录权限,确保挂载卷后依然有效 diff --git a/source/stack/docker-dev/Dockerfile b/source/stack/docker-dev/Dockerfile index dfe445b..178d340 100644 --- a/source/stack/docker-dev/Dockerfile +++ b/source/stack/docker-dev/Dockerfile @@ -63,8 +63,8 @@ RUN composer dump-autoload # RUN install-php-extensions @composer # Dev mode PHP config (overrides zz-phprun.ini) -COPY docker/zzz-dev.ini /usr/local/etc/php/conf.d/zzz-dev.ini -COPY docker/zzz-xdebug.ini /usr/local/etc/php/conf.d/zzz-xdebug.ini +COPY source/docker/zzz-dev.ini /usr/local/etc/php/conf.d/zzz-dev.ini +COPY source/docker/zzz-xdebug.ini /usr/local/etc/php/conf.d/zzz-xdebug.ini VOLUME /var/www/html/runtime VOLUME /var/www/html/public/storage @@ -77,9 +77,9 @@ VOLUME /var/www/html/storage # Expose Nginx port EXPOSE 8000 -RUN chmod +x /var/www/html/docker/run.sh +RUN chmod +x /var/www/html/source/docker/run.sh # Start Nginx and PHP-FPM -ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"] +ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"] CMD ["server"] diff --git a/source/stack/docker-dev/docker/run.sh b/source/stack/docker-dev/source/docker/run.sh similarity index 78% rename from source/stack/docker-dev/docker/run.sh rename to source/stack/docker-dev/source/docker/run.sh index eb72155..459df17 100644 --- a/source/stack/docker-dev/docker/run.sh +++ b/source/stack/docker-dev/source/docker/run.sh @@ -1,16 +1,16 @@ #!/bin/bash # 将代码中的nginx复制到nginx配置文件中 -cp /var/www/html/docker/nginx.conf /etc/nginx/sites-available/default +cp /var/www/html/source/docker/nginx.conf /etc/nginx/sites-available/default ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default # 将代码中的php配置文件复制到php配置文件中 -cp /var/www/html/docker/zz-phprun.ini /usr/local/etc/php/conf.d -cp /var/www/html/docker/zz-phpfpm.conf /usr/local/etc/php-fpm.d +cp /var/www/html/source/docker/zz-phprun.ini /usr/local/etc/php/conf.d +cp /var/www/html/source/docker/zz-phpfpm.conf /usr/local/etc/php-fpm.d # 开发模式:覆盖生产PHP配置(Opcache、错误显示、Xdebug) -cp /var/www/html/docker/zzz-dev.ini /usr/local/etc/php/conf.d -cp /var/www/html/docker/zzz-xdebug.ini /usr/local/etc/php/conf.d +cp /var/www/html/source/docker/zzz-dev.ini /usr/local/etc/php/conf.d +cp /var/www/html/source/docker/zzz-xdebug.ini /usr/local/etc/php/conf.d # 设置目录权限,确保挂载卷后依然有效 diff --git a/source/stack/docker-dev/docker/zzz-dev.ini b/source/stack/docker-dev/source/docker/zzz-dev.ini similarity index 100% rename from source/stack/docker-dev/docker/zzz-dev.ini rename to source/stack/docker-dev/source/docker/zzz-dev.ini diff --git a/source/stack/docker-dev/docker/zzz-xdebug.ini b/source/stack/docker-dev/source/docker/zzz-xdebug.ini similarity index 100% rename from source/stack/docker-dev/docker/zzz-xdebug.ini rename to source/stack/docker-dev/source/docker/zzz-xdebug.ini diff --git a/source/stack/full/Dockerfile b/source/stack/full/Dockerfile index eb5b4a3..281bb89 100644 --- a/source/stack/full/Dockerfile +++ b/source/stack/full/Dockerfile @@ -72,10 +72,10 @@ VOLUME /var/www/html/storage # 暴露 Nginx 端口 EXPOSE 8000 -RUN chmod +x /var/www/html/docker/run.sh +RUN chmod +x /var/www/html/source/docker/run.sh # 启动 Nginx PHP 然后阻塞 -ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"] +ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"] CMD ["server"] diff --git a/source/stack/stack.json b/source/stack/stack.json index 75d4904..a65e67d 100644 --- a/source/stack/stack.json +++ b/source/stack/stack.json @@ -6,9 +6,9 @@ ".gitea/workflows/build-and-deploy.yml", ".docker-dev.env", ".dockerignore", - "docker/zzz-dev.ini", - "docker/zzz-xdebug.ini", - "docker/run.sh" + "source/docker/zzz-dev.ini", + "source/docker/zzz-xdebug.ini", + "source/docker/run.sh" ], "modes": { "default": {