diff --git a/content/en/docs/project-user-guide/image-builder/source-to-image.md b/content/en/docs/project-user-guide/image-builder/source-to-image.md index 20fd9f861..0c7dbb75f 100644 --- a/content/en/docs/project-user-guide/image-builder/source-to-image.md +++ b/content/en/docs/project-user-guide/image-builder/source-to-image.md @@ -25,7 +25,7 @@ This tutorial demonstrates how to use S2I to import source code of a Java sample Log in to GitHub and fork the GitHub repository [devops-java-sample](https://github.com/kubesphere/devops-java-sample) to your personal GitHub account. -![fork-repository](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/fork-repository.jpg) +![fork-repository](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/fork-repository.png) ### Step 2: Create Secrets @@ -41,21 +41,21 @@ You do not need to create the GitHub Secret if your forked repository is open to 1. In the same project, navigate to **Services** under **Application Workloads** and click **Create**. - ![create-service](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-service.jpg) + ![create-service](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-service.png) 2. Choose **Java** under **Build a New Service from Source Code Repository**, name it `s2i-demo` and click **Next**. - ![select-lang-type](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/select-lang-type.jpg) + ![select-lang-type](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/select-lang-type.png) {{< notice note >}} - KubeSphere has integrated common S2I templates such as Java, Node.js and Python. If you want to use other languages or customize your S2I templates, see Customize S2I Templates. + KubeSphere has integrated common S2I templates such as Java, Node.js and Python. If you want to use other languages or customize your S2I templates, see [Customize S2I Templates](../s2i-templates/). {{}} 3. On the **Build Settings** page, provide the following information accordingly and click **Next**. - ![build-settings](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-settings.jpg) + ![build-settings](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-settings.png) **Service Type**: Select **Stateless Service** for this example. For more information about different Services, see [Service Type](../../../project-user-guide/application-workloads/services/#service-type). @@ -63,7 +63,7 @@ You do not need to create the GitHub Secret if your forked repository is open to **Code URL**: The source code repository address (currently support Git). You can specify the code branch and the relative path in the source code terminal. The URL supports HTTP and HTTPS. Paste the forked repository URL (your own repository address) into this field. - ![copy-repo-code](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/copy-repo-code.jpg) + ![copy-repo-code](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/copy-repo-code.png) **Branch**: The branch that is used for image building. Enter `master` for this tutorial. You can enter `dependency` for a cache test. @@ -79,11 +79,11 @@ You do not need to create the GitHub Secret if your forked repository is open to 4. On the **Container Settings** page, scroll down to **Service Settings** to set the access policy for the container. Select **HTTP** for **Protocol**, customize the name (for example, `http-1`), and enter `8080` for both **Container Port** and **Service Port**. - ![service-settings](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-settings.jpg) + ![service-settings](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-settings.png) -5. Scroll down to **Health Checker** and check it. Set a readiness probe by filling out the following parameters. Click **√** when you finish setting the probe and then click **Next** to continue. +5. Scroll down to **Health Checker** and select it. Set a readiness probe by filling out the following parameters. Click **√** when you finish setting the probe and then click **Next** to continue. - ![health-checker](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/health-checker.jpg) + ![health-checker](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/health-checker.png) **HTTP Request**: Select **HTTP** as the protocol, enter `/` as the path (root path in this tutorial), and enter `8080` as the port exposed. @@ -95,49 +95,49 @@ You do not need to create the GitHub Secret if your forked repository is open to 6. On the **Mount Volumes** page, you can add a volume for the container. For more information, see [Volumes](../../../project-user-guide/storage/volumes/). Click **Next** to continue. -7. On the **Advanced Settings** page, check **Internet Access** and select **NodePort** as the access method. Click **Create** to finish the whole process. +7. On the **Advanced Settings** page, select **Internet Access** and select **NodePort** as the access method. Click **Create** to finish the whole process. - ![create-finish](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-finish.jpg) + ![create-finish](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-finish.png) 8. Click **Image Builder** from the navigation bar and you can see that the example image is being built. - ![building](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/building.jpg) + ![building](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/building.png) ### Step 4: Check results 1. Wait for a while and you can see the status of the image has reached **Successful**. - ![success-result](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/success-result.jpg) + ![success-result](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/success-result.png) -2. Click this image to go to its detail page. Under **Job Records**, click the arrow icon on the right of a record to see building logs. You can see `Build completed successfully` at the end of the log if everything runs normally. +2. Click this image to go to its detail page. Under **Job Records**, click on the right of a record to see building logs. You can see `Build completed successfully` at the end of the log if everything runs normally. - ![build-log](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-log.jpg) + ![build-log](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-log.png) 3. Go back to the previous page, and you can see the corresponding Job, Deployment and Service of the image have been all created successfully. #### Service - ![service](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service.jpg) + ![service](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service.png) #### Deployment - ![deployment](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/deployment.jpg) + ![deployment](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/deployment.png) #### Job - ![job](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/job.jpg) + ![job](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/job.png) 4. In your Docker Hub repository, you can see that KubeSphere has pushed the image to the repository with the expected tag. - ![docker-image](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/docker-image.jpg) + ![docker-image](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/docker-image.png) ### Step 5: Access the S2I Service 1. On the **Services** page, click the S2I Service to go to its detail page. - ![service-detail](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-detail.jpg) + ![service-detail](/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-detail.png) -2. To access the Service, you can either use the endpoint with the `curl` command or visit `Node IP:Port Number`. For example: +2. To access the Service, you can either use the endpoint with the `curl` command or visit `:`. For example: ```bash $ curl 10.10.131.44:8080 diff --git a/content/zh/docs/project-user-guide/image-builder/source-to-image.md b/content/zh/docs/project-user-guide/image-builder/source-to-image.md index a0f07d783..f7f277586 100644 --- a/content/zh/docs/project-user-guide/image-builder/source-to-image.md +++ b/content/zh/docs/project-user-guide/image-builder/source-to-image.md @@ -49,7 +49,7 @@ Source-to-Image (S2I) 是一个工具箱和工作流,用于从源代码构建 {{< notice note >}} - KubeSphere 已集成常用的 S2I 模板,例如 Java、Node.js 和 Python。如果您想使用其他语言或自定义 S2I 模板,请参见自定义 S2I 模板。 + KubeSphere 已集成常用的 S2I 模板,例如 Java、Node.js 和 Python。如果您想使用其他语言或自定义 S2I 模板,请参见[自定义 S2I 模板](../s2i-templates/)。 {{}} @@ -109,7 +109,7 @@ Source-to-Image (S2I) 是一个工具箱和工作流,用于从源代码构建 ![构建成功](/images/docs/zh-cn/project-user-guide/image-builder/source-to-image/successful-result.PNG) -2. 点击该镜像前往其详情页面。在**任务记录**下,点击记录右侧的箭头图标查看构建日志。如果一切运行正常,您可以在日志末尾看到 `Build completed successfully`。 +2. 点击该镜像前往其详情页面。在**任务记录**下,点击记录右侧的 查看构建日志。如果一切运行正常,您可以在日志末尾看到 `Build completed successfully`。 ![构建日志](/images/docs/zh-cn/project-user-guide/image-builder/source-to-image/build-log.PNG) @@ -137,7 +137,7 @@ Source-to-Image (S2I) 是一个工具箱和工作流,用于从源代码构建 ![Service 详情](/images/docs/zh-cn/project-user-guide/image-builder/source-to-image/service-detail.PNG) -2. 要访问该服务,您可以执行 `curl` 命令使用 Endpoint 或者访问 `Node IP:Port Number`。例如: +2. 要访问该服务,您可以执行 `curl` 命令使用 Endpoint 或者访问 `:`。例如: ```bash $ curl 10.10.131.44:8080 diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-log.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-log.jpg deleted file mode 100644 index 75f1267e3..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-log.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-log.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-log.png new file mode 100644 index 000000000..335b827de Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-log.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-settings.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-settings.jpg deleted file mode 100644 index 269dec714..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-settings.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-settings.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-settings.png new file mode 100644 index 000000000..fed8f4297 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/build-settings.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/building.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/building.jpg deleted file mode 100644 index 64195ae80..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/building.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/building.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/building.png new file mode 100644 index 000000000..d0340f928 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/building.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/copy-repo-code.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/copy-repo-code.jpg deleted file mode 100644 index e4c44a9ec..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/copy-repo-code.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/copy-repo-code.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/copy-repo-code.png new file mode 100644 index 000000000..66fd008c4 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/copy-repo-code.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-finish.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-finish.jpg deleted file mode 100644 index bafffef76..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-finish.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-finish.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-finish.png new file mode 100644 index 000000000..1d766cb74 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-finish.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-service.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-service.jpg deleted file mode 100644 index b7adf8eff..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-service.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-service.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-service.png new file mode 100644 index 000000000..22282786b Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/create-service.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/deployment.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/deployment.jpg deleted file mode 100644 index b3cf2836c..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/deployment.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/deployment.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/deployment.png new file mode 100644 index 000000000..038f1312c Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/deployment.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/docker-image.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/docker-image.jpg deleted file mode 100644 index d0e8347f4..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/docker-image.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/docker-image.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/docker-image.png new file mode 100644 index 000000000..26859563d Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/docker-image.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/down-arrow.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/down-arrow.png new file mode 100644 index 000000000..aad16238c Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/down-arrow.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/fork-repository.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/fork-repository.jpg deleted file mode 100644 index b7210388b..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/fork-repository.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/fork-repository.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/fork-repository.png new file mode 100644 index 000000000..b2cbe1079 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/fork-repository.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/health-checker.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/health-checker.jpg deleted file mode 100644 index cb78e7c1b..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/health-checker.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/health-checker.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/health-checker.png new file mode 100644 index 000000000..a6efce609 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/health-checker.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/job.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/job.jpg deleted file mode 100644 index 05f696c2f..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/job.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/job.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/job.png new file mode 100644 index 000000000..0972ea7fd Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/job.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/select-lang-type.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/select-lang-type.jpg deleted file mode 100644 index fce923c3f..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/select-lang-type.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/select-lang-type.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/select-lang-type.png new file mode 100644 index 000000000..276398252 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/select-lang-type.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-detail.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-detail.jpg deleted file mode 100644 index c6f36970d..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-detail.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-detail.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-detail.png new file mode 100644 index 000000000..49b97df86 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-detail.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-settings.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-settings.jpg deleted file mode 100644 index cc06d49a3..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-settings.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-settings.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-settings.png new file mode 100644 index 000000000..efef50338 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service-settings.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service.jpg deleted file mode 100644 index 9612ec191..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service.png new file mode 100644 index 000000000..59c1bd509 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/service.png differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/success-result.jpg b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/success-result.jpg deleted file mode 100644 index a27ef0691..000000000 Binary files a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/success-result.jpg and /dev/null differ diff --git a/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/success-result.png b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/success-result.png new file mode 100644 index 000000000..4e1f0a9a0 Binary files /dev/null and b/static/images/docs/project-user-guide/image-builder/s2i-publish-app-without-dockerfile/success-result.png differ diff --git a/static/images/docs/zh-cn/project-user-guide/image-builder/source-to-image/down-arrow.png b/static/images/docs/zh-cn/project-user-guide/image-builder/source-to-image/down-arrow.png new file mode 100644 index 000000000..aad16238c Binary files /dev/null and b/static/images/docs/zh-cn/project-user-guide/image-builder/source-to-image/down-arrow.png differ