[GR-53994] Fold GraalVM CE and Oracle GraalVM install guides into one version; Add more installation options.

PullRequest: graal/18258

Author: olyagpl

docs/enterprise-overview/overview.md

@@ -33,7 +33,7 @@ Oracle GraalVM's key benefits are:
 
 ## What to Read Next
 
-Start with installing Oracle GraalVM by following the [installation guide](../getting-started/graalvm-enterprise/get-started-graalvm-enterprise.md).
+Start with installing Oracle GraalVM by following the [installation guide](../getting-started/get-started.md).
 
 Whether you are new to Oracle GraalVM and Native Image or have little experience using it, continue to [Getting Started](../reference-manual/native-image/README.md).
 

docs/getting-started/graalvm-community/container-images/graalvm-ce-container-images.md renamed to docs/getting-started/container-images/graalvm-ce-container-images.md

@@ -2,7 +2,8 @@
 layout: docs
 toc_group: container-images
 link_title: Container Images
-permalink: /docs/getting-started/container-images/
+permalink: /getting-started/container-images/
+redirect_from: /docs/getting-started/container-images/
 ---
 
 ## GraalVM Community Edition Container Images
@@ -13,13 +14,13 @@ To support container-based development, GraalVM Community Edition container imag
 
 There are different GraalVM Community Edition container images provided depending on the architecture and the Java version, and have `-community` as part of their names.
 These are: **native-image-community**, **jdk-community**, **truffleruby-community**, **nodejs-community**, and **graalpy-community**.
-The container images are multi-arch, for AMD64 and AArch64 processor architectures, with a choice of Oracle Linux versions 7, 8, or 9.
+The container images are multi-arch, for x64 and AArch64 processor architectures, with a choice of Oracle Linux versions 7, 8, or 9.
 
-GraalVM is installed in _/usr/lib64/graalvm/graalvm-community-java&lt;$FeatureVersion&gt;_ where `<$FeatureVersion>` is `17`, `21`, `22`, etc.
-For instance, GraalVM for JDK 22 is installed in _/usr/lib64/graalvm/graalvm-community-java22_. 
+GraalVM is installed in _/usr/lib64/graalvm/graalvm-community-java&lt;$FeatureVersion&gt;/_ where `<$FeatureVersion>` is `17`, `21`, `23`, and so on.
+For instance, GraalVM for JDK 23 is installed in _/usr/lib64/graalvm/graalvm-community-java23/_. 
 All binaries, including `java`, `javac`, `native-image`, and other binaries are available as global commands via the `alternatives` command.
 
-> Note: For GraalVM non-RPM based images (**graalvm-community**, **python-community**, **truffleruby-community**), installation location is under _/opt_ (_/opt/graalvm-community-java&lt;$FeatureVersion&gt;_, _/opt/truffleruby-&lt;$GRAALVM_VERSION&gt;_, and _/opt/graalpy-&lt;$GRAALVM_VERSION&gt;_ respectively).
+> Note: For GraalVM non-RPM based images (**graalvm-community**, **python-community**, **truffleruby-community**), the installation location is under _/opt/_ (_/opt/graalvm-community-java&lt;$FeatureVersion&gt;/_, _/opt/truffleruby-&lt;$GRAALVM_VERSION&gt;/_, and _/opt/graalpy-&lt;$GRAALVM_VERSION&gt;/_ respectively).
 
 > Note: GraalVM Community Edition container images are based on Oracle Linux slim images, and the default package manager is `microdnf`.
 
@@ -29,7 +30,6 @@ See a full list of GraalVM Community Edition container images [here](https://git
 
 Each repository provides multiple tags that let you choose the level of stability you need including the Java version, build number, and the Oracle Linux version. 
 Image tags use the following naming convention:
-
 ```bash
 $version[-muslib(for native image only)][-$platform][-$buildnumber]
 ```
@@ -47,44 +47,42 @@ For example:
 
 ## Pulling Images
 
-1. To pull the container image for GraalVM JDK for a specific JDK feature version, such as _22_, run:
+1. To pull the container image for GraalVM JDK for a specific JDK feature version, such as _23_, run:
     ```bash
-    docker pull ghcr.io/graalvm/jdk-community:22
+    docker pull ghcr.io/graalvm/jdk-community:23
     ```
 
     Alternatively, to use the container image as the base image in your Dockerfile, use:
     ```bash
-    FROM ghcr.io/graalvm/jdk-community:22
+    FROM ghcr.io/graalvm/jdk-community:23
     ```
-
     You have pulled a size compact GraalVM Community Edition container image with the GraalVM JDK and the Graal compiler preinstalled.
 
-2. To pull the container image with the `native-image` utility for a specific JDK feature version, such as _22_, run: 
+2. To pull the container image with the `native-image` utility for a specific JDK feature version, such as _23_, run: 
     ```bash
-    docker pull ghcr.io/graalvm/native-image-community:22
+    docker pull ghcr.io/graalvm/native-image-community:23
     ```
-
-	Alternatively, to pull the container image with the `native-image` utility with the `musl libc` toolchain to create fully statically linked executables, use:
+    
+    Alternatively, to pull the container image with the `native-image` utility with the `musl libc` toolchain to create fully statically linked executables, use:
     ```bash
-    docker pull ghcr.io/graalvm/native-image-community:22-muslib
+    docker pull ghcr.io/graalvm/native-image-community:23-muslib
     ```
 
     Alternatively, to use the container image as the base image in your Dockerfile, use:
     ```bash
-    FROM ghcr.io/graalvm/native-image-community:22-muslib
+    FROM ghcr.io/graalvm/native-image-community:23-muslib
     ```
 
-3. To verify, start the container and enter the Bash session:
+3. To verify, start the container and enter a Bash session:
     ```bash
-    docker run -it --rm --entrypoint /bin/bash ghcr.io/graalvm/native-image-community:22
+    docker run -it --rm --entrypoint /bin/bash ghcr.io/graalvm/native-image-community:23
     ```
 
 	To check the version of GraalVM and its installed location, run the `env` command from the Bash prompt:
     ```bash
     env
     ```
-
-    The output shows the environment variable `JAVA_HOME` pointing to the installed GraalVM version and location.
+    The output includes the environment variable `JAVA_HOME` with its value corresponding to the installed GraalVM version and location.
 
 	To check the Java version, run:
     ```bash
@@ -96,16 +94,16 @@ For example:
     native-image --version
     ```
 
-4. Calling `docker pull` without specifying a processor architecture pulls container images for the processor architecture that matches your Docker client. To pull container images for a different platform architecture, specify the desired platform architecture with the `--platform` option and either `linux/amd64` or `linux/aarch64` as follows:
+4. Calling `docker pull` without specifying a processor architecture pulls container images for the processor architecture that matches your Docker client. To pull a container image for a different platform architecture, specify the desired platform architecture with the `--platform` option and either `linux/amd64` or `linux/aarch64` as follows:
     ```bash
-    docker pull --platform linux/aarch64 ghcr.io/graalvm/native-image-community:22
+    docker pull --platform linux/aarch64 ghcr.io/graalvm/native-image-community:23
     ```
 
 ## Oracle GraalVM Container Images 
 
 Oracle GraalVM container images are published in the [Oracle Container Registry](https://container-registry.oracle.com/ords/ocr/ba/graalvm) under the [GraalVM Free Terms and Conditions (GFTC) license](https://www.oracle.com/downloads/licenses/graal-free-license.html). 
-Learn more at [Oracle Help Center](https://docs.oracle.com/en/graalvm/jdk/21/docs/getting-started/container-images/#oracle-graalvm-container-images).
+Learn more at the [Oracle Help Center](https://docs.oracle.com/en/graalvm/jdk/21/docs/getting-started/container-images/#oracle-graalvm-container-images).
 
-### Learn More
+### Related Documentation
 
-- [GraalVM Native Image, Spring and Containerisation](https://luna.oracle.com/lab/fdfd090d-e52c-4481-a8de-dccecdca7d68): Learn how GraalVM Native Image can generate native executables ideal for containerization.
+- [Tiny Java Containers](https://github.com/graalvm/graalvm-demos/tree/master/tiny-java-containers): Learn how GraalVM Native Image can generate native executables ideal for containerization.

docs/getting-started/graalvm-enterprise/container-images/graalvm-ee-container-images.md renamed to docs/getting-started/container-images/oracle-graalvm-container-images.md

@@ -1,5 +1,5 @@
 ---
-layout: docs
+layout: ohc
 toc_group: container-images
 link_title: Oracle GraalVM Container Images
 permalink: /getting-started/container-images/
@@ -15,27 +15,26 @@ Oracle GraalVM container images are published in two OCR repositories: **jdk** a
 
 | Repository       | Description |
 |------------------|-------------|
-| **jdk**          | Provides container images with Oracle GraalVM JDK (without the `native-image` utility) which can be used to both compile and deploy Java applications. Use the container image tags to select the appropriate Java version and Oracle Linux version. |
-| **native-image** | Provides Oracle GraalVM container images with the `native-image` utility along with all tools required to compile applications into native Linux executables. These images are commonly used in multistage builds to compile applications into executables that are then packaged in a lightweight container image. Use the container image tags to select the Java version and Oracle Linux version as well as variants that include the musl toolchain for the creation of fully statically linked executables. |
+| **jdk**          | Provides container images with Oracle GraalVM JDK (without the `native-image` utility) which can be used to both compile and deploy a Java application. Use the container image tags to select the appropriate Java version and Oracle Linux version. |
+| **native-image** | Provides Oracle GraalVM container images with the `native-image` utility along with all tools required to compile an application into a native Linux executables. These images are commonly used in multistage builds to compile an application into an executable that is then packaged in a lightweight container image. Use the container image tags to select the Java version and Oracle Linux version as well as variants that include the musl toolchain for the creation of a fully statically linked executable. |
 
-Both repositories provide container images for AMD64 and AArch64 processor architectures, with a choice of Oracle Linux versions 7, 8, or 9.
+Both repositories provide container images for x64 and AArch64 processor architectures, with a choice of Oracle Linux versions 7, 8, or 9.
 
-Oracle GraalVM is installed in _/usr/lib64/graalvm/graalvm-java&lt;$FeatureVersion&gt;_ where `<$FeatureVersion>` is `17`, `21`, `22`, and so on. 
-For example, Oracle GraalVM for JDK 22 is installed in _/usr/lib64/graalvm/graalvm-java22_. 
+Oracle GraalVM is installed in _/usr/lib64/graalvm/graalvm-java&lt;$FeatureVersion&gt;/_ where `<$FeatureVersion>` is `17`, `21`, `23`, and so on.
+
+For example, Oracle GraalVM for JDK 23 is installed in _/usr/lib64/graalvm/graalvm-java23/_.
 All binaries, including `java`, `javac`, `native-image`, and other binaries are available as global commands via the `alternatives` command.
 
 ## Tags
 
 Each repository provides multiple tags that let you choose the level of stability you need including the Java version, build number, and the Oracle Linux version. 
 Oracle GraalVM container image tags use the following naming convention:
-
 ```bash
 $version[-muslib(for native image only)][-$platform][-$buildnumber]
 ```
 
 The following tags are listed from the most-specific tag (at the top) to the least-specific tag (at the bottom). 
 The most-specific tag is unique and always points to the same container image, while the less-specific tags point to newer container image variants over time.
-
 ```
 22.0.1-ol9-20240504
 22.0.1-ol9
@@ -46,75 +45,60 @@ The most-specific tag is unique and always points to the same container image, w
 
 ## Pulling Images
 
-1. To pull the container image for Oracle GraalVM JDK for a specific JDK feature version, such as _22_, run:
-
+1. To pull the container image for Oracle GraalVM JDK for a specific JDK feature version, such as _23_, run:
     ```bash
-    docker pull container-registry.oracle.com/graalvm/jdk:22
+    docker pull container-registry.oracle.com/graalvm/jdk:23
     ```
 
     Alternatively, to use the container image as the base image in your Dockerfile, use:
-    
     ```bash
-    FROM container-registry.oracle.com/graalvm/jdk:22
+    FROM container-registry.oracle.com/graalvm/jdk:23
     ```
 
-2.  To pull the container image for Oracle GraalVM `native-image` utility for a specific JDK feature version, such as _22_, run: 
-    
+2.  To pull the container image for Oracle GraalVM `native-image` utility for a specific JDK feature version, such as _23_, run: 
     ```bash
-    docker pull container-registry.oracle.com/graalvm/native-image:22
+    docker pull container-registry.oracle.com/graalvm/native-image:23
     ```
-
-	Alternatively, to pull the container image for Oracle GraalVM `native-image` utility with the `musl libc` toolchain to create fully statically linked executables, run:
 
+    Alternatively, to pull the container image for Oracle GraalVM `native-image` utility with the `musl libc` toolchain to create fully statically linked executables, run:
     ```bash
-    docker pull container-registry.oracle.com/graalvm/native-image:22-muslib
+    docker pull container-registry.oracle.com/graalvm/native-image:23-muslib
     ```
 
     Alternatively, to use the container image as the base image in your Dockerfile, use:
-    
     ```bash
-    FROM container-registry.oracle.com/graalvm/native-image:22-muslib
+    FROM container-registry.oracle.com/graalvm/native-image:23-muslib
     ```
 
-3. To verify, start the container and enter a `bash` session:
-
+3. To verify, start the container and enter a Bash session:
     ```bash
-    docker run -it --rm --entrypoint /bin/bash container-registry.oracle.com/graalvm/native-image:22
+    docker run -it --rm --entrypoint /bin/bash container-registry.oracle.com/graalvm/native-image:23
     ```
 
-	To check the version of Oracle GraalVM and its installed location, run the `env` command from the `bash` prompt:
-
+    To check the version of Oracle GraalVM and its installed location, run the `env` command from the `bash` prompt:
     ```bash
     env
     ```
-    
-    The output shows the environment variable `JAVA_HOME` pointing to the installed Oracle GraalVM version and location.
+    The output includes the environment variable `JAVA_HOME` with its value corresponding to the installed GraalVM version and location.
 
-	To check the Java version, run the following command from the `bash` prompt:
-    
+	To check the version of GraalVM and its installed location, run the `env` command from the Bash prompt:
     ```bash
     java -version
     ```
-    
     The output shows the installed Oracle GraalVM Java runtime environment and version information.
 
-    To check the `native-image` version, run the following command from the `bash` prompt:
-    
+    To check the `native-image` version, run the following command from the Bash prompt:
     ```bash
     native-image --version
     ```
-    
     The output shows the installed Oracle GraalVM `native-image` utility version information.
 
-4. A `docker pull` command that omits a processor architecture pulls container images for the processor architecture that matches your Docker client. 
-To pull container images for a different platform architecture, specify the desired platform architecture with the `--platform` option and either `linux/amd64` or `linux/aarch64` as follows:
-
+4. A `docker pull` command that omits a processor architecture pulls a container image for the processor architecture that matches your Docker client. To pull a container image for a different platform architecture, specify the desired platform architecture with the `--platform` option and either `linux/amd64` or `linux/aarch64` as follows:
     ```bash
-    docker pull --platform linux/aarch64 container-registry.oracle.com/graalvm/native-image:22
+    docker pull --platform linux/aarch64 container-registry.oracle.com/graalvm/native-image:23
     ```
 
 ### Related Documentation
 
-- [GraalVM Native Image, Spring and Containerisation](https://luna.oracle.com/lab/fdfd090d-e52c-4481-a8de-dccecdca7d68): Learn how GraalVM Native Image can generate native executables ideal for containerization.
-- [Announcement Blog: New Oracle GraalVM Container Images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images)
-
+- [Tiny Java Containers](https://github.com/graalvm/graalvm-demos/tree/master/tiny-java-containers): Learn how GraalVM Native Image can generate native executables ideal for containerization.
+- [Announcement Blog: New Oracle GraalVM Container Images](https://blogs.oracle.com/java/post/new-oracle-graalvm-container-images)