Merge pull request #291942 from hangwan97/TOC_refine

JillGrant615 · web-flow · commit ca5dff1e88ff · 2025-03-05T20:32:40.000-07:00
Update TOC.yml
diff --git a/articles/container-apps/TOC.yml b/articles/container-apps/TOC.yml
@@ -381,9 +381,27 @@
       - name: Turn on Java features
         href: java-feature-switch.md
         displayName: java
+      - name: Automatic memory fitting (preview)
+        href: java-memory-fit.md
+        displayName: java
+      - name: Build environment variables (preview)
+        href: java-build-environment-variables.md
+        displayName: java    
       - name: Launch your first Java app
-        href: java-get-started.md
-      - name: Artificial Intelligence
+        items:
+        - name: Dockerfile
+          href: /azure/developer/java/toolkit-for-intellij/java-get-started-dockerfile.md
+          displayName: java
+        - name: Github repository
+          href: /azure/developer/java/toolkit-for-intellij/java-get-started-github-repository.md
+          displayName: java
+        - name: IntelliJ
+          href: /azure/developer/java/toolkit-for-intellij/create-container-apps-intellij?toc=/azure/container-apps/toc.json&bc=/azure/container-apps/breadcrumb/toc.json
+          displayName: java
+        - name: Artifacts (preview)
+          href: java-get-started.md
+          displayName: java
+      - name: Artificial intelligence
         items:
         - name: PetClinic AI
           items: 
@@ -394,55 +412,51 @@
             href: java-petclinic-ai-tutorial.md
             displayName: java
         displayName: java
-      - name: Launch your first Java microservice apps with managed Java components
-        href: java-microservice-get-started.md
-        displayName: java
-      - name: Get started using IntelliJ
-        href: /azure/developer/java/toolkit-for-intellij/create-container-apps-intellij?toc=/azure/container-apps/toc.json&bc=/azure/container-apps/breadcrumb/toc.json
-        displayName: java
-      - name: Automatic memory fitting (preview)
-        href: java-memory-fit.md
-        displayName: java
-      - name: Build environment variables (preview)
-        href: java-build-environment-variables.md
-        displayName: java
-      - name: Metrics
-        href: java-metrics.md
-        displayName: java
-      - name: Scale with Java metrics
-        href: java-metrics-scale-with-keda.md
-        displayName: java
-      - name: Connect to Eureka Server for Spring
-        href: java-eureka-server.md
-        displayName: java
-      - name: Connect to Admin for Spring
-        href: java-admin.md
-        displayName: java
-      - name: Connect to Config Server for Spring
-        href: java-config-server.md
-        displayName: java
-      - name: Connect to Gateway for Spring
-        href: java-gateway-for-spring.md
-        displayName: java
-      - name: Set dynamic logger level
-        href: java-dynamic-log-level.md
-        displayName: java
-      - name: Tutorials
+      - name: Java components
         items:
-          - name: Integrate Eureka Server with Admin for Spring
-            href: java-admin-eureka-integration.md
-            displayName: java
-          - name: Query managed component logs
-            href: java-component-logs.md
-            displayName: java
-          - name: Configure Application Performance Management (APM) Java agent with init-container
-            href: java-application-performance-management-config.md
-          - name: Create a highly available Eureka server component cluster
-            href: java-eureka-server-highly-available.md
-            displayName: java
-          - name: Build a Java metrics dashboard with Azure Managed Grafana
-            href: java-metrics-with-grafana.md
-            displayName: java
+        - name: Launch your first Java microservice apps with managed Java components
+          href: java-microservice-get-started.md
+          displayName: java
+        - name: Connect to Eureka Server for Spring
+          href: java-eureka-server.md
+          displayName: java
+        - name: Integrate Eureka Server with Admin for Spring
+          href: java-admin-eureka-integration.md
+          displayName: java
+        - name: Create a highly available Eureka server component cluster
+          href: java-eureka-server-highly-available.md
+          displayName: java
+        - name: Connect to Admin for Spring
+          href: java-admin.md
+          displayName: java
+        - name: Connect to Config Server for Spring
+          href: java-config-server.md
+          displayName: java
+        - name: Connect to Gateway for Spring
+          href: java-gateway-for-spring.md
+          displayName: java
+      - name: Monitoring
+        items:
+        - name: Java metrics
+          href: java-metrics.md
+          displayName: java
+        - name: Query managed component logs
+          href: java-component-logs.md
+          displayName: java
+        - name: Configure application performance management (APM) Java agent with init-container
+          href: java-application-performance-management-config.md
+          displayName: java
+        - name: Scale with Java metrics
+          href: java-metrics-scale-with-keda.md
+          displayName: java
+        - name: Build a Java metrics dashboard with Azure Managed Grafana
+          href: java-metrics-with-grafana.md
+          displayName: java
+      - name: Diagnostic
+        items:
+        - name: Set dynamic logger level
+          href: java-dynamic-log-level.md
+          displayName: java
     - name: JavaScript
       items: 
       - name: Overview
diff --git a/articles/container-apps/includes/java-get-started-introduction-and-prerequisites-and-install-azure-container-apps-cli-extension.md b/articles/container-apps/includes/java-get-started-introduction-and-prerequisites-and-install-azure-container-apps-cli-extension.md
@@ -0,0 +1,29 @@
+---
+author: KarlErickson
+ms.author: karler
+ms.reviewer: hangwan
+ms.service: azure-container-apps
+ms.topic: include
+ms.date: 03/05/2025
+---
+
+There are several options available for deploying Java applications, including the following options:
+
+- Deployment from a local file system or from a code repository.
+- Deployment using Maven or an IDE.
+- Deployment using a WAR file, a JAR file, or directly from source code.
+
+By the end of this tutorial, you deploy a web application that you can manage through the Azure portal. The following screenshot shows the home page of the PetClinic application deployed to Azure Container Apps:
+
+:::image type="content" source="../media/java-get-started/azure-container-apps-spring-pet-clinic-home-page.png" alt-text="Screenshot of the home page of the PetClinic app." lightbox="../media/java-get-started/azure-container-apps-spring-pet-clinic-home-page.png":::
+
+## Prerequisites
+
+- An Azure subscription. [Create one for free.](https://azure.microsoft.com/free/).
+- The `Contributor` or `Owner` permission on the Azure subscription. For more information, see [Assign Azure roles using the Azure portal](../../role-based-access-control/role-assignments-portal.yml?tabs=current).
+- [A GitHub account](https://github.com/join).
+- [Git](https://git-scm.com/downloads)
+- [Azure CLI](/cli/azure/install-azure-cli)
+- The Azure Container Apps CLI extension, version 0.3.47 or higher. Use the following command to install the latest version: `az extension add --name containerapp --upgrade --allow-preview`
+- [The Java Development Kit](/java/openjdk/install), version 17 or later.
+- [Apache Maven](https://maven.apache.org/download.cgi)
diff --git a/articles/container-apps/includes/java-get-started-next-steps.md b/articles/container-apps/includes/java-get-started-next-steps.md
@@ -0,0 +1,14 @@
+---
+author: KarlErickson
+ms.author: karler
+ms.reviewer: hangwan
+ms.service: azure-container-apps
+ms.topic: include
+ms.date: 03/05/2025
+---
+
+## Related content
+
+- [Quickstart: Launch your first Java microservice application with managed Java components in Azure Container Apps](../java-microservice-get-started.md)
+- [Java PetClinic AI sample in Container Apps overview](../java-petclinic-ai-overview.md)
+- [Build environment variables for Java in Azure Container Apps (preview)](../java-build-environment-variables.md)
diff --git a/articles/container-apps/includes/java-get-started-verify-app-status-and-cleanup-and-next-steps.md b/articles/container-apps/includes/java-get-started-verify-app-status-and-cleanup-and-next-steps.md
@@ -0,0 +1,22 @@
+---
+author: KarlErickson
+ms.author: karler
+ms.reviewer: hangwan
+ms.service: azure-container-apps
+ms.topic: include
+ms.date: 03/05/2025
+---
+
+## Verify the app status
+
+After the deployment finishes, go to the Azure portal **Overview** page of your container app and select **Application Url** to see the application running in the cloud.
+
+## Clean up resources
+
+If you plan to continue working with more quickstarts and tutorials, you might want to leave these resources in place. When you no longer need the resources, you can remove them to avoid Azure charges, by using the following command:
+
+```azurecli
+az group delete --name $RESOURCE_GROUP
+```
+
+[!INCLUDE [java-get-started-next-steps](java-get-started-next-steps.md)]
diff --git a/articles/container-apps/java-get-started-dockerfile.md b/articles/container-apps/java-get-started-dockerfile.md
@@ -0,0 +1,90 @@
+---
+title: Launch Your First Java application in Azure Container Apps Using a Dockerfile
+description: Learn how to deploy a Java project in Azure Container Apps using a Dockerfile.
+services: container-apps
+author: KarlErickson
+ms.author: karler
+ms.reviewer: hangwan
+ms.service: azure-container-apps
+ms.custom: devx-track-java, devx-track-extended-java 
+ms.topic: quickstart
+ms.date: 03/05/2025
+---
+
+# Quickstart: Launch your first Java application in Azure Container Apps using a Dockerfile
+
+This article shows you how to deploy the Spring PetClinic sample application to Azure Container Apps using a Dockerfile.
+
+[!INCLUDE [java-get-started-introduction-and-prerequisites-and-install-azure-container-apps-cli-extension](includes/java-get-started-introduction-and-prerequisites-and-install-azure-container-apps-cli-extension.md)]
+
+## Build the project locally
+
+Build the Spring PetClinic application on your local machine by using the following steps:
+
+1. Clone the [Azure Container Apps Java Samples](https://github.com/Azure-Samples/azure-container-apps-java-samples) repo by using the following command:
+
+    ```bash
+    git clone https://github.com/Azure-Samples/azure-container-apps-java-samples.git
+    ```
+
+1. Navigate to the **spring-petclinic** folder by using the following command:
+
+    ```bash
+    cd azure-container-apps-java-samples/spring-petclinic/spring-petclinic/
+    ```
+
+1. Initialize and update the PetClinic application to the latest version by using the following command:
+
+    ```bash
+    git submodule update --init --recursive
+    ```
+
+1. Build the PetClinic application by using the following command:
+
+    ```bash
+    ./mvnw clean install
+    ```
+
+1. Run your application locally by using the following command:
+
+    ```bash
+    ./mvnw spring-boot:run
+    ```
+
+1. After the application is up, access it locally at `http://localhost:8080`.
+
+## Deploy the PetClinic application to Azure Container Apps
+
+Deploy the PetClinic application to Azure Container Apps by using the following steps:
+
+1. Set the necessary environment variables by using the following commands:
+
+    ```bash
+    export RESOURCE_GROUP="pet-clinic-container-apps"
+    export LOCATION="canadacentral"
+    export ENVIRONMENT="env-pet-clinic-container-apps"
+    export CONTAINER_APP_NAME="pet-clinic"
+    ```
+
+1. Sign in to Azure from the CLI if you aren't already signed in. For more information, see the [Setup](quickstart-code-to-cloud.md?tabs=bash%2Cjava#setup) section of [Build and deploy from local source code to Azure Container Apps](quickstart-code-to-cloud.md).
+
+1. Build and deploy the Spring PetClinic app by using the following command. The `..` (dot dot) indicates that you're using the Dockerfile in the parent folder.
+
+    ```azurecli
+    az containerapp up \
+        --resource-group $RESOURCE_GROUP \
+        --name $CONTAINER_APP_NAME \
+        --location $LOCATION \
+        --environment $ENVIRONMENT \
+        --source ..
+    ```
+
+    This command accomplishes the following tasks:
+
+    - Creates the resource group.
+    - Creates an Azure container registry.
+    - Builds the container image and pushes it to the registry.
+    - Creates the Container Apps environment with a Log Analytics workspace.
+    - Creates and deploys the container app using the built container image.
+
+[!INCLUDE [java-get-started-verify-app-status-and-cleanup-and-next-steps](includes/java-get-started-verify-app-status-and-cleanup-and-next-steps.md)]
diff --git a/articles/container-apps/java-get-started-github-repository.md b/articles/container-apps/java-get-started-github-repository.md
@@ -0,0 +1,65 @@
+---
+title: Launch your First Java Application in Azure Container Apps Using a GitHub Repository
+description: Learn how to deploy a Java project in Azure Container Apps using a GitHub Repository.
+services: container-apps
+author: KarlErickson
+ms.author: karler
+ms.reviewer: hangwan
+ms.service: azure-container-apps
+ms.custom: devx-track-java, devx-track-extended-java
+ms.topic: quickstart
+ms.date: 03/05/2025
+---
+
+# Quickstart: Launch your first Java application in Azure Container Apps using a GitHub Repository
+
+This article shows you how to deploy the Spring PetClinic sample application to Azure Container Apps using a GitHub repository.
+
+[!INCLUDE [java-get-started-introduction-and-prerequisites-and-install-azure-container-apps-cli-extension](includes/java-get-started-introduction-and-prerequisites-and-install-azure-container-apps-cli-extension.md)]
+
+## Prepare the project
+
+Use the **Fork** button on the [Azure Container Apps Java Samples](https://github.com/Azure-Samples/azure-container-apps-java-samples.git) repo page to fork the repo to your personal GitHub account. When the fork is complete, copy the fork's URL for use in the next section.
+
+## Deploy the project
+
+Deploy the project by using the following steps:
+
+1. Set the necessary environment variables by using the following commands:
+
+    ```bash
+    export RESOURCE_GROUP="pet-clinic-container-apps"
+    export LOCATION="canadacentral"
+    export ENVIRONMENT="env-pet-clinic-container-apps"
+    export CONTAINER_APP_NAME="pet-clinic"
+    export REPO_URL="<URL-of-your-GitHub-repo-fork>"
+    ```
+
+1. Sign in to Azure from the CLI if you aren't already signed in. For more information, see the [Setup](quickstart-code-to-cloud.md?tabs=bash%2Cjava#setup) section of [Quickstart: Build and deploy from local source code to Azure Container Apps](quickstart-code-to-cloud.md).
+
+1. Build and deploy your Spring Boot app by using the following command:
+
+    ```azurecli
+    az containerapp up \
+        --resource-group $RESOURCE_GROUP \
+        --name $CONTAINER_APP_NAME \
+        --location $LOCATION \
+        --environment $ENVIRONMENT \
+        --context-path ./spring-petclinic \
+        --repo $REPO_URL
+    ```
+
+    This command performs the following tasks:
+
+    - Creates the resource group.
+    - Creates an Azure container registry.
+    - Builds the container image and pushes it to the registry.
+    - Creates the Container Apps environment with a Log Analytics workspace.
+    - Creates and deploys the container app by using the built container image.
+
+The project is now deployed. When you push new code to the repository, a GitHub Action performs the following tasks:
+
+- Builds the container image and pushes it to the Azure container registry.
+- Deploys the container image to the created container app.
+
+[!INCLUDE [java-get-started-verify-app-status-and-cleanup-and-next-steps](includes/java-get-started-verify-app-status-and-cleanup-and-next-steps.md)]
diff --git a/articles/container-apps/java-get-started.md b/articles/container-apps/java-get-started.md
diff --git a/articles/container-apps/media/java-get-started/azure-container-apps-spring-pet-clinic-home-page.png b/articles/container-apps/media/java-get-started/azure-container-apps-spring-pet-clinic-home-page.png
