Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker 打包逻辑改进，彻底解决缓存问题 #3473

Merged
merged 3 commits into from
Dec 27, 2023
Merged

Docker 打包逻辑改进，彻底解决缓存问题 #3473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d01b96
feat: update nginx.conf 使用固定编译入口可能导致浏览器使用缓存js文件，而此配置可以解决
adoin Sep 19, 2023
52b24df
Merge branch 'vbenjs:main' into main
adoin Dec 27, 2023
c2ea474
feat: 更新docker打包逻辑： 原本固定的entry是为了方便替换环境变量，同时在nginx配置内让每次获取js等资源都不走缓存。…
adoin Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ MAINTAINER Adoin 'adoin@qq.com'
WORKDIR /app
COPY . ./
# 设置 node 阿里镜像
RUN npm config set registry https://registry.npm.taobao.org
RUN npm config set registry https://registry.npmmirror.com
# 设置--max-old-space-size
ENV NODE_OPTIONS=--max-old-space-size=16384
# 设置阿里镜像、pnpm、依赖、编译
Expand All @@ -20,7 +20,6 @@ COPY --from=build-stage /app/dist /usr/share/nginx/html/dist
COPY --from=build-stage /app/nginx.conf /etc/nginx/nginx.conf
EXPOSE 80
## 将/usr/share/nginx/html/dist/assets/index.js 和/usr/share/nginx/html/dist/_app.config.js中的"$vg_base_url"替换为环境变量中的VG_BASE_URL,$vg_sub_domain 替换成VG_SUB_DOMAIN，$vg_default_user替换成VG_DEFAULT_USER，$vg_default_password替换成VG_DEFAULT_PASSWORD 而后启动nginx
CMD sed -i "s|__vg_base_url|$VG_BASE_URL|g" /usr/share/nginx/html/dist/assets/index.js && \
sed -i "s|__vg_base_url|$VG_BASE_URL|g" /usr/share/nginx/html/dist/_app.config.js && \
CMD sed -i "s|__vg_base_url|$VG_BASE_URL|g" /usr/share/nginx/html/dist/assets/entry/index-*.js /usr/share/nginx/html/dist/_app.config.js && \
nginx -g 'daemon off;'
RUN echo "🎉 架 🎉 设 🎉 成 🎉 功 🎉"
4 changes: 2 additions & 2 deletions internal/vite-config/src/config/application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function defineApplicationConfig(defineOptions: DefineOptions = {}) {
});

const pathResolve = (pathname: string) => resolve(root, '.', pathname);

const timestamp = new Date().getTime();
const applicationConfig: UserConfig = {
base: VITE_PUBLIC_PATH,
resolve: {
Expand Down Expand Up @@ -64,7 +64,7 @@ function defineApplicationConfig(defineOptions: DefineOptions = {}) {
rollupOptions: {
output: {
// 入口文件名
entryFileNames: 'assets/[name].js',
entryFileNames: `assets/entry/[name]-[hash]-${timestamp}.js`,
manualChunks: {
vue: ['vue', 'pinia', 'vue-router'],
antd: ['ant-design-vue', '@ant-design/icons-vue'],
Expand Down
7 changes: 4 additions & 3 deletions nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ http {
add_header 'Content-Length' 0;
return 204;
}
if ($request_filename ~* ^.*?.(html|htm|js)$) {
add_header Cache-Control no-cache;
}
# docker 改造之后不再需要
# if ($request_filename ~* ^.*?.(html|htm|js)$) {
# add_header Cache-Control no-cache;
# }
}
}
}