mirror of
https://gitee.com/ulthon/ulthon_admin.git
synced 2026-08-30 12:45:32 +08:00
fix(stack): 修复 B-route 下所有 Dockerfile COPY 路径与 build context 不匹配
B-route 把 build context 改为仓库根后,Dockerfile 中的 COPY source/docker/... 和 chmod/ENTRYPOINT 引用 /var/www/html/source/docker/ 全部失效。 根因: - 仓库根有全局 source/docker/(仅 nginx.conf/zz-phprun.ini/zz-phpfpm.conf 基础配置) - 模式专属配置(run.sh、zzz-dev.ini、zzz-xdebug.ini 等)在 source/stack/<mode>/source/docker/ - COPY . 把全局 source/docker/ 复制进容器,但缺少模式专属文件 - 旧 COPY source/docker/zzz-dev.ini 在 context=仓库根时找不到文件 修复(所有 5 个模式统一): - 每个 Dockerfile 在 COPY . 后加 rm -rf + ln -sf symlink, 让 /var/www/html/source/docker 指向模式专属配置目录 - COPY ini 文件路径改为完整的 source/stack/<mode>/source/docker/... - .dockerignore 去掉 source/stack/ 排除(配置文件仅几 KB, 但 COPY 需要这些文件在 build context 中) - .dockerignore 加 docker-dev/docker-dev-data 排除(旧数据残留)
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
runtime
|
runtime
|
||||||
node_modules
|
node_modules
|
||||||
*.sock
|
*.sock
|
||||||
|
docker-dev
|
||||||
|
docker-dev-data
|
||||||
.docker-dev-sync
|
.docker-dev-sync
|
||||||
.docker-dev.env
|
.docker-dev.env
|
||||||
source/stack/
|
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ RUN composer install --no-dev --no-interaction --no-scripts --no-autoloader
|
|||||||
# 将当前目录下的文件拷贝到工作目录
|
# 将当前目录下的文件拷贝到工作目录
|
||||||
COPY . /var/www/html
|
COPY . /var/www/html
|
||||||
|
|
||||||
|
# B-route: build context 为仓库根,模式配置在 source/stack/<mode>/source/docker/
|
||||||
|
RUN rm -rf /var/www/html/source/docker && ln -sf /var/www/html/source/stack/author/source/docker /var/www/html/source/docker
|
||||||
|
|
||||||
# 生成自动加载文件
|
# 生成自动加载文件
|
||||||
RUN composer dump-autoload --optimize --no-dev --classmap-authoritative
|
RUN composer dump-autoload --optimize --no-dev --classmap-authoritative
|
||||||
|
|
||||||
|
|||||||
@@ -56,6 +56,9 @@ RUN composer install --no-interaction --no-scripts
|
|||||||
# Copy all files to working directory
|
# Copy all files to working directory
|
||||||
COPY . /var/www/html
|
COPY . /var/www/html
|
||||||
|
|
||||||
|
# B-route: build context 为仓库根,模式配置在 source/stack/<mode>/source/docker/
|
||||||
|
RUN rm -rf /var/www/html/source/docker && ln -sf /var/www/html/source/stack/docker-dev-sync/source/docker /var/www/html/source/docker
|
||||||
|
|
||||||
# Generate autoloader (without --no-dev optimizations)
|
# Generate autoloader (without --no-dev optimizations)
|
||||||
RUN composer dump-autoload
|
RUN composer dump-autoload
|
||||||
|
|
||||||
@@ -63,8 +66,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 source/docker/zzz-dev.ini /usr/local/etc/php/conf.d/zzz-dev.ini
|
COPY source/stack/docker-dev-sync/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
|
COPY source/stack/docker-dev-sync/source/docker/zzz-xdebug.ini /usr/local/etc/php/conf.d/zzz-xdebug.ini
|
||||||
|
|
||||||
# Create source mount point (host code staging area)
|
# Create source mount point (host code staging area)
|
||||||
RUN mkdir -p /var/www/source
|
RUN mkdir -p /var/www/source
|
||||||
|
|||||||
@@ -56,6 +56,12 @@ RUN composer install --no-interaction --no-scripts
|
|||||||
# Copy all files to working directory
|
# Copy all files to working directory
|
||||||
COPY . /var/www/html
|
COPY . /var/www/html
|
||||||
|
|
||||||
|
# B-route: build context 为仓库根,模式配置在 source/stack/<mode>/source/docker/
|
||||||
|
# 仓库根有全局 source/docker/(仅基础配置),模式目录内的是超集(含 run.sh、dev 配置)
|
||||||
|
# 删除全局目录并创建 symlink 指向模式专属配置,让 run.sh 引用的路径能找到文件
|
||||||
|
RUN rm -rf /var/www/html/source/docker \
|
||||||
|
&& ln -sf /var/www/html/source/stack/docker-dev/source/docker /var/www/html/source/docker
|
||||||
|
|
||||||
# Generate autoloader (without --no-dev optimizations)
|
# Generate autoloader (without --no-dev optimizations)
|
||||||
RUN composer dump-autoload
|
RUN composer dump-autoload
|
||||||
|
|
||||||
@@ -63,8 +69,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 source/docker/zzz-dev.ini /usr/local/etc/php/conf.d/zzz-dev.ini
|
COPY source/stack/docker-dev/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
|
COPY source/stack/docker-dev/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
|
||||||
|
|||||||
@@ -11,6 +11,9 @@ RUN composer install --no-dev --no-interaction --no-scripts --no-autoloader
|
|||||||
# 将当前目录下的文件拷贝到工作目录
|
# 将当前目录下的文件拷贝到工作目录
|
||||||
COPY . /var/www/html
|
COPY . /var/www/html
|
||||||
|
|
||||||
|
# B-route: build context 为仓库根,模式配置在 source/stack/<mode>/source/docker/
|
||||||
|
RUN rm -rf /var/www/html/source/docker && ln -sf /var/www/html/source/stack/docker-serve/source/docker /var/www/html/source/docker
|
||||||
|
|
||||||
# 生成自动加载文件
|
# 生成自动加载文件
|
||||||
RUN composer dump-autoload --optimize --no-dev --classmap-authoritative
|
RUN composer dump-autoload --optimize --no-dev --classmap-authoritative
|
||||||
|
|
||||||
|
|||||||
@@ -55,6 +55,9 @@ RUN composer install --no-dev --no-interaction --no-scripts --no-autoloader
|
|||||||
# 将当前目录下的文件拷贝到工作目录
|
# 将当前目录下的文件拷贝到工作目录
|
||||||
COPY . /var/www/html
|
COPY . /var/www/html
|
||||||
|
|
||||||
|
# B-route: build context 为仓库根,模式配置在 source/stack/<mode>/source/docker/
|
||||||
|
RUN rm -rf /var/www/html/source/docker && ln -sf /var/www/html/source/stack/full/source/docker /var/www/html/source/docker
|
||||||
|
|
||||||
# 生成自动加载文件
|
# 生成自动加载文件
|
||||||
RUN composer dump-autoload --optimize --no-dev --classmap-authoritative
|
RUN composer dump-autoload --optimize --no-dev --classmap-authoritative
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user