diff --git a/Dockerfile b/Dockerfile index eaaeacc..5993eac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,22 +50,22 @@ COPY --from=s3build /app/dist /dist #============================================ chatdesk-ui ======================================================== FROM nvcr.io/nvidia/tritonserver:24.04-py3-min AS chataibuilder -# RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ -# apt-get update && \ -# apt-get install -y nodejs && \ -# npm install -g npm@10.8.2 pnpm@10.9.0 +RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ + apt-get update && \ + apt-get install -y nodejs && \ + npm install -g npm@10.8.2 pnpm@10.9.0 -# WORKDIR /app +WORKDIR /app -# # 拷贝依赖文件并安装生产依赖 -# COPY chatdesk-ui/package.json chatdesk-ui/package-lock.json ./ -# RUN npm ci +# 拷贝依赖文件并安装生产依赖 +COPY chatdesk-ui/package.json chatdesk-ui/package-lock.json ./ +RUN npm ci -# # 拷贝全部源码 -# COPY chatdesk-ui/. . +# 拷贝全部源码 +COPY chatdesk-ui/. . -# # 构建项目 -# RUN npm run build +# 构建项目 +RUN npm run build #============================================ gotrue build====================================================== @@ -349,7 +349,7 @@ ADD --chmod=0755 \ RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql COPY ./supabase ./supabase -RUN chmod +x /supabase/postgres/wrapper.sh /supabase/postgrest/wrapper.sh /supabase/gotrue/wrapper.sh /supabase/storage-api/wrapper.sh /supabase/kong/wrapper.sh +RUN chmod +x /supabase/postgres/wrapper.sh /supabase/postgrest/wrapper.sh /supabase/gotrue/wrapper.sh /supabase/storage-api/wrapper.sh /supabase/kong/wrapper.sh /supabase/chatdesk/wrapper.sh #ENTRYPOINT ["docker-entrypoint.sh"] ENTRYPOINT ["supervisord"] @@ -409,24 +409,19 @@ COPY --from=s3final node_modules /supabase/storage-api/node_modules COPY --from=s3final dist /supabase/storage-api/dist COPY --from=s3final migrations /supabase/storage-api/migrations +#========================================= chatdesk-ui ======================================================== +# 拷贝依赖声明并安装仅生产依赖 +COPY chatdesk-ui/package.json chatdesk-ui/package-lock.json supabase/chatdesk/ +WORKDIR /supabase/chatdesk +RUN npm ci +# 拷贝构建产物和依赖 +COPY --from=chataibuilder /app/.next ./.next +COPY --from=chataibuilder /app/public ./public +COPY --from=chataibuilder /app/next.config.js ./next.config.js +COPY .env.local ./.env.local +COPY chatdesk-ui/supabase ./supabase - - - -# #========================================= chatdesk-ui ======================================================== -# # 拷贝依赖声明并安装仅生产依赖 -# COPY chatdesk-ui/package.json chatdesk-ui/package-lock.json supabase/chatdesk/ -# WORKDIR /supabase/chatdesk -# RUN npm ci - -# # 拷贝构建产物和依赖 -# COPY --from=chataibuilder /app/.next ./.next -# COPY --from=chataibuilder /app/public ./public -# COPY --from=chataibuilder /app/next.config.js ./next.config.js -# COPY .env.local ./.env.local -# COPY chatdesk-ui/supabase ./supabase - -# WORKDIR / -# ENV NODE_ENV=production -# EXPOSE 3030 \ No newline at end of file +WORKDIR / +ENV NODE_ENV=production +EXPOSE 3030 \ No newline at end of file diff --git a/README b/README new file mode 100644 index 0000000..f352c01 --- /dev/null +++ b/README @@ -0,0 +1 @@ +如果用已知的Linux上的git项目创建新的git项目时,千万不要在Windows上git init,因为Windows由于不支持+x的可执行权限,会把项目中的.sh脚本的执行权限给清除掉,导致再次clone到linux系统时,这些脚本以及引用这些脚本的Docker发生异常。 \ No newline at end of file