diff --git a/web-ui/Dockerfile b/web-ui/Dockerfile index 6339f8ab1a6e66871589a22e1582c48f9ed6674b..438efb2ad538e7a1b14a9309397b00f5c096a7c0 100644 --- a/web-ui/Dockerfile +++ b/web-ui/Dockerfile @@ -7,8 +7,13 @@ WORKDIR /home/openeuler/web COPY . /home/openeuler/web RUN npm install -g vuepress && \ + npm install -g increase-memory-limit && \ npm install && \ - npm run build + increase-memory-limit + +CMD sed -i 's/"%_prog%"/%_prog/g' mode_modules/.bin/vuepress.cmd + +RUN npm run build FROM nginx:1.19.2 diff --git a/web-ui/docs/.vuepress/data/download.js b/web-ui/docs/.vuepress/data/download.js index eb4980e3ce126ac8b76786e6a82ffcc4b57092b7..a09d32f5218b2aaf1e40e0ec62285bfe7972e546 100644 --- a/web-ui/docs/.vuepress/data/download.js +++ b/web-ui/docs/.vuepress/data/download.js @@ -16,7 +16,7 @@ module.exports = { LIFE_CYCLE_URL: '/zh/other/lifecycle/', MANUFACTURER: 'openEuler社区', PUBLISH_DATE: '2020/09', - LTS: true + LTS: false }, { NAME: 'openEuler 20.03 LTS', @@ -140,4 +140,4 @@ module.exports = { } ] } -}; +}; \ No newline at end of file diff --git a/web-ui/docs/en/other/lifecycle/README.md b/web-ui/docs/en/other/lifecycle/README.md index 924836a31810ef9e086eddc3f4353c34b78e6e73..7bb621c987774e79b77e8798392dfda71b8288f5 100644 --- a/web-ui/docs/en/other/lifecycle/README.md +++ b/web-ui/docs/en/other/lifecycle/README.md @@ -12,7 +12,7 @@ The community version is divided into an LTS (long-term support) release and an - **LTS release**: released every 2 years, and community support is provided for 4 years starting the release date. The community's first LTS version, openEuler 20.03 LTS, was officially released in March 20th. -- **Community Innovation release**: released every 6 months between 2 LTS releases and 6 months' support is provided.The next version will be released in March 2021. +- **Community Innovation release**: released every 6 months between 2 LTS releases and 6 months' support is provided. ![](./lifecycle.png) diff --git a/web-ui/docs/en/other/lifecycle/lifecycle.png b/web-ui/docs/en/other/lifecycle/lifecycle.png index 4ba5ca50d532e536d9c051d38aff6a7b7fb02553..a296e202e66c113baf7a42a22c1885baed5cb43e 100644 Binary files a/web-ui/docs/en/other/lifecycle/lifecycle.png and b/web-ui/docs/en/other/lifecycle/lifecycle.png differ diff --git a/web-ui/docs/zh/docs/path/path.json b/web-ui/docs/zh/docs/path/path.json index 70505f2e86841e153d36c52553c63c53b7862844..8532e5c64f7ca819b876b726ac8bad0799e9e261 100644 --- a/web-ui/docs/zh/docs/path/path.json +++ b/web-ui/docs/zh/docs/path/path.json @@ -205,7 +205,7 @@ { "img": "/img/docs/docs-user.svg", "path": "/docs/StratoVirt/StratoVirtGuide.html", - "name": "StratoVrit虚拟化用户指南" + "name": "StratoVirt虚拟化用户指南" }, { "img": "/img/docs/docs-user.svg", diff --git a/web-ui/docs/zh/news/20200930.md b/web-ui/docs/zh/news/20200930.md index beaacb881928e64fe8272d60c3e20d568e55dd54..394aa90eaa89c88702737fbc18c191e8a04ecda4 100644 --- a/web-ui/docs/zh/news/20200930.md +++ b/web-ui/docs/zh/news/20200930.md @@ -19,9 +19,9 @@ summary: "openEuler 20.09 如约而至" 经过社区贡献者的共同努力，openEuler 正式发布了 **openEuler 20.09** 版本。根据版本计划，**openEuler 20.09** 版本属于创新版本而非 **LTS (Long Term Support)** 版本。该版本的 Linux Kernel 使用 **4.19.140** 版本，修复了自 20.03 版本发布以来发现的 CVE 漏洞。在该版本的开发过程中社区贡献者总共合并了 **11485** 个 Pull Request，SIG 组的数量也增加到了 **71** 个，覆盖了从云计算、云原生到桌面端等多个领域。同时社区开发者在 openEuler 20.09 版本中带来了众多的新特性，尤其是带来了全新的开源项目 **StratoVirt** ，它是一个安全、轻量、高性能、低损耗、组件化的面向全场景的通用化虚拟机运行时项目，同时 **iSula** 项目也发布了 **isula-build** 实现了镜像构建能力。 ### 下载地址 -ISO 下载地址 [点击这里](https://repo.openeuler.org/openEuler-20.09/ISO/) +ISO 下载地址 [https://repo.openeuler.org/openEuler-20.09/ISO/](https://repo.openeuler.org/openEuler-20.09/ISO/) -Raspberry IMG 下载地址 [点击这里](https://repo.openeuler.org/openEuler-20.09/raspi_img/aarch64/) +Raspberry IMG 下载地址 [https://repo.openeuler.org/openEuler-20.09/raspi_img/aarch64/](https://repo.openeuler.org/openEuler-20.09/raspi_img/aarch64/) ### 新特性列表 - StratoVirt： diff --git a/web-ui/docs/zh/other/lifecycle/README.md b/web-ui/docs/zh/other/lifecycle/README.md index 1cc0926f9294fbecf99d06f4c965cd44e7b4a451..11acd1c8065ed1f5f058353154ec748b06633776 100644 --- a/web-ui/docs/zh/other/lifecycle/README.md +++ b/web-ui/docs/zh/other/lifecycle/README.md @@ -12,7 +12,7 @@ title : "openEuler版本规划及生命周期" - **长期支持版本**：发布间隔周期定为2年，提供4年社区支持。社区首个LTS版本openEuler 20.03 已于20年3月正式发布。 -- **社区创新版本**：openEuler每隔6个月会发布一个社区创新版本，提供6个月社区支持，下一个社区创新版本将于2021年3月发布。 +- **社区创新版本**：LTS版本之间每隔6个月openEuler会发布一个社区创新版本，提供6个月社区支持，下一个社区创新版本将于2020年09月发布。 ![](./lifecycle.png) diff --git a/web-ui/docs/zh/other/lifecycle/lifecycle.png b/web-ui/docs/zh/other/lifecycle/lifecycle.png index 4ba5ca50d532e536d9c051d38aff6a7b7fb02553..a296e202e66c113baf7a42a22c1885baed5cb43e 100644 Binary files a/web-ui/docs/zh/other/lifecycle/lifecycle.png and b/web-ui/docs/zh/other/lifecycle/lifecycle.png differ diff --git a/web-ui/package.json b/web-ui/package.json index 548e54c17fd598a899f065eca623c8062bc84e6a..c8b59d9eaff90f93be6a586332099a2adb4758f7 100644 --- a/web-ui/package.json +++ b/web-ui/package.json @@ -5,7 +5,7 @@ "main": "index.js", "scripts": { "dev": "vuepress dev docs", - "build": "node --max_old_space_size=8192 node_modules/vuepress/cli.js build docs" + "build": "vuepress build docs" }, "keywords": [], "author": "",