mirror of
https://gitee.com/ulthon/ulthon_admin.git
synced 2026-07-07 18:42:49 +08:00
refactor: 迁移根目录 docker/ 到 source/docker/,更新所有路径引用
- 将 docker/{nginx.conf,run.sh,zz-phprun.ini,zz-phpfpm.conf} 移动到 source/docker/
- 更新所有 Dockerfile 中 /var/www/html/docker/ -> /var/www/html/source/docker/
- 更新 stack.json managed_files 路径前缀
- 重组 stack 模式目录结构 docker/ -> source/docker/
- 更新 source/README.md 目录描述
- 更新 AdminUpdateServiceBase.php 可选文件前缀
This commit is contained in:
@@ -25,10 +25,10 @@ VOLUME /var/www/html/storage
|
|||||||
# 暴露 Nginx 端口
|
# 暴露 Nginx 端口
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
RUN chmod +x /var/www/html/docker/run.sh
|
RUN chmod +x /var/www/html/source/docker/run.sh
|
||||||
|
|
||||||
# 启动 Nginx PHP 然后阻塞
|
# 启动 Nginx PHP 然后阻塞
|
||||||
ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"]
|
ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"]
|
||||||
|
|
||||||
CMD ["server"]
|
CMD ["server"]
|
||||||
|
|
||||||
|
|||||||
@@ -361,7 +361,7 @@ class AdminUpdateServiceBase
|
|||||||
'app',
|
'app',
|
||||||
'config',
|
'config',
|
||||||
'route',
|
'route',
|
||||||
'docker',
|
'source/docker',
|
||||||
];
|
];
|
||||||
|
|
||||||
foreach ($optional_files_prefix as $prefix) {
|
foreach ($optional_files_prefix as $prefix) {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
- `source/assets/fonts/`
|
- `source/assets/fonts/`
|
||||||
- `source/docs/`:项目资料(说明文档、流程文档、交付文档等)
|
- `source/docs/`:项目资料(说明文档、流程文档、交付文档等)
|
||||||
- `source/attachments/`:附件与素材(非代码交付物、原始文件等)
|
- `source/attachments/`:附件与素材(非代码交付物、原始文件等)
|
||||||
- `source/docker/`:附属服务/可选服务编排与开发辅助(与根目录 `docker/` 区分)
|
- `source/docker/`:本项目 Docker 运行所需的配置文件(nginx、PHP、PHP-FPM、启动脚本)
|
||||||
- `source/clients/`:各端前端/客户端工程
|
- `source/clients/`:各端前端/客户端工程
|
||||||
- `source/clients/uniapp/`:uni-app(Vue3 + Vite + JavaScript)
|
- `source/clients/uniapp/`:uni-app(Vue3 + Vite + JavaScript)
|
||||||
- `source/clients/vue-screen/`:预留“大屏端”目录
|
- `source/clients/vue-screen/`:预留“大屏端”目录
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
|
|
||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# 将代码中的nginx复制到nginx配置文件中
|
# 将代码中的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
|
ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
|
||||||
|
|
||||||
# 将代码中的php配置文件复制到php配置文件中
|
# 将代码中的php配置文件复制到php配置文件中
|
||||||
cp /var/www/html/docker/zz-phprun.ini /usr/local/etc/php/conf.d
|
cp /var/www/html/source/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-phpfpm.conf /usr/local/etc/php-fpm.d
|
||||||
|
|
||||||
|
|
||||||
# 设置目录权限,确保挂载卷后依然有效
|
# 设置目录权限,确保挂载卷后依然有效
|
||||||
@@ -25,9 +25,9 @@ VOLUME /var/www/html/storage
|
|||||||
# 暴露 Nginx 端口
|
# 暴露 Nginx 端口
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
RUN chmod +x /var/www/html/docker/run.sh
|
RUN chmod +x /var/www/html/source/docker/run.sh
|
||||||
|
|
||||||
# 启动 Nginx PHP 然后阻塞
|
# 启动 Nginx PHP 然后阻塞
|
||||||
ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"]
|
ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"]
|
||||||
|
|
||||||
CMD ["server"]
|
CMD ["server"]
|
||||||
|
|||||||
@@ -25,10 +25,10 @@ VOLUME /var/www/html/storage
|
|||||||
# 暴露 Nginx 端口
|
# 暴露 Nginx 端口
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
RUN chmod +x /var/www/html/docker/run.sh
|
RUN chmod +x /var/www/html/source/docker/run.sh
|
||||||
|
|
||||||
# 启动 Nginx PHP 然后阻塞
|
# 启动 Nginx PHP 然后阻塞
|
||||||
ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"]
|
ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"]
|
||||||
|
|
||||||
CMD ["server"]
|
CMD ["server"]
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# 将代码中的nginx复制到nginx配置文件中
|
# 将代码中的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
|
ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
|
||||||
|
|
||||||
# 将代码中的php配置文件复制到php配置文件中
|
# 将代码中的php配置文件复制到php配置文件中
|
||||||
cp /var/www/html/docker/zz-phprun.ini /usr/local/etc/php/conf.d
|
cp /var/www/html/source/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-phpfpm.conf /usr/local/etc/php-fpm.d
|
||||||
|
|
||||||
|
|
||||||
# 设置目录权限,确保挂载卷后依然有效
|
# 设置目录权限,确保挂载卷后依然有效
|
||||||
@@ -63,8 +63,8 @@ RUN composer dump-autoload
|
|||||||
# RUN install-php-extensions @composer
|
# RUN install-php-extensions @composer
|
||||||
|
|
||||||
# Dev mode PHP config (overrides zz-phprun.ini)
|
# Dev mode PHP config (overrides zz-phprun.ini)
|
||||||
COPY docker/zzz-dev.ini /usr/local/etc/php/conf.d/zzz-dev.ini
|
COPY source/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-xdebug.ini /usr/local/etc/php/conf.d/zzz-xdebug.ini
|
||||||
|
|
||||||
VOLUME /var/www/html/runtime
|
VOLUME /var/www/html/runtime
|
||||||
VOLUME /var/www/html/public/storage
|
VOLUME /var/www/html/public/storage
|
||||||
@@ -77,9 +77,9 @@ VOLUME /var/www/html/storage
|
|||||||
# Expose Nginx port
|
# Expose Nginx port
|
||||||
EXPOSE 8000
|
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
|
# 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"]
|
CMD ["server"]
|
||||||
|
|||||||
@@ -1,16 +1,16 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# 将代码中的nginx复制到nginx配置文件中
|
# 将代码中的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
|
ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
|
||||||
|
|
||||||
# 将代码中的php配置文件复制到php配置文件中
|
# 将代码中的php配置文件复制到php配置文件中
|
||||||
cp /var/www/html/docker/zz-phprun.ini /usr/local/etc/php/conf.d
|
cp /var/www/html/source/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-phpfpm.conf /usr/local/etc/php-fpm.d
|
||||||
|
|
||||||
# 开发模式:覆盖生产PHP配置(Opcache、错误显示、Xdebug)
|
# 开发模式:覆盖生产PHP配置(Opcache、错误显示、Xdebug)
|
||||||
cp /var/www/html/docker/zzz-dev.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/docker/zzz-xdebug.ini /usr/local/etc/php/conf.d
|
cp /var/www/html/source/docker/zzz-xdebug.ini /usr/local/etc/php/conf.d
|
||||||
|
|
||||||
|
|
||||||
# 设置目录权限,确保挂载卷后依然有效
|
# 设置目录权限,确保挂载卷后依然有效
|
||||||
@@ -72,10 +72,10 @@ VOLUME /var/www/html/storage
|
|||||||
# 暴露 Nginx 端口
|
# 暴露 Nginx 端口
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
RUN chmod +x /var/www/html/docker/run.sh
|
RUN chmod +x /var/www/html/source/docker/run.sh
|
||||||
|
|
||||||
# 启动 Nginx PHP 然后阻塞
|
# 启动 Nginx PHP 然后阻塞
|
||||||
ENTRYPOINT ["/bin/bash", "/var/www/html/docker/run.sh"]
|
ENTRYPOINT ["/bin/bash", "/var/www/html/source/docker/run.sh"]
|
||||||
|
|
||||||
CMD ["server"]
|
CMD ["server"]
|
||||||
|
|
||||||
|
|||||||
@@ -6,9 +6,9 @@
|
|||||||
".gitea/workflows/build-and-deploy.yml",
|
".gitea/workflows/build-and-deploy.yml",
|
||||||
".docker-dev.env",
|
".docker-dev.env",
|
||||||
".dockerignore",
|
".dockerignore",
|
||||||
"docker/zzz-dev.ini",
|
"source/docker/zzz-dev.ini",
|
||||||
"docker/zzz-xdebug.ini",
|
"source/docker/zzz-xdebug.ini",
|
||||||
"docker/run.sh"
|
"source/docker/run.sh"
|
||||||
],
|
],
|
||||||
"modes": {
|
"modes": {
|
||||||
"default": {
|
"default": {
|
||||||
|
|||||||
Reference in New Issue
Block a user