Skip to content

Commit e57e8ba

Browse files
Merge pull request #3 from craigshoemaker/aca/spring-boot-admin
[Container Apps] Fix build issues
2 parents 1ef6359 + 335690a commit e57e8ba

File tree

7 files changed

+44
-46
lines changed

7 files changed

+44
-46
lines changed

articles/container-apps/java-admin-eureka-integration.md

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -92,45 +92,45 @@ Before you begin, create the necessary resources by executing the following comm
9292

9393
## Optional: Create the Eureka Server for Spring
9494

95-
1. If you don't have an existing Eureka Server for Spring, follow the command below to create the Eureka Server Java component. For more information, see [Create the Eureka Server for Spring](java-eureka-server.md#create-the-eureka server-for-spring-java-component).
95+
If you don't have an existing Eureka Server for Spring, follow the command below to create the Eureka Server Java component. For more information, see [Create the Eureka Server for Spring](java-eureka-server.md#create-the-eureka server-for-spring-java-component).
9696
97-
```azurecli
98-
az containerapp env java-component eureka-server-for-spring create \
99-
--environment $ENVIRONMENT \
100-
--resource-group $RESOURCE_GROUP \
101-
--name $EUREKA_COMPONENT_NAME
102-
```
97+
```azurecli
98+
az containerapp env java-component eureka-server-for-spring create \
99+
--environment $ENVIRONMENT \
100+
--resource-group $RESOURCE_GROUP \
101+
--name $EUREKA_COMPONENT_NAME
102+
```
103103
104104
## Bind the components together
105105
106-
1. Create the Admin for Spring Java component.
106+
Create the Admin for Spring Java component.
107107
108-
```azurecli
109-
az containerapp env java-component admin-for-spring create \
110-
--environment $ENVIRONMENT \
111-
--resource-group $RESOURCE_GROUP \
112-
--name $ADMIN_COMPONENT_NAME \
113-
--bind $EUREKA_COMPONENT_NAME
114-
```
108+
```azurecli
109+
az containerapp env java-component admin-for-spring create \
110+
--environment $ENVIRONMENT \
111+
--resource-group $RESOURCE_GROUP \
112+
--name $ADMIN_COMPONENT_NAME \
113+
--bind $EUREKA_COMPONENT_NAME
114+
```
115115
116116
## Bind other apps to the Eureka Server
117117
118118
With the Eureka Server set up, you can now bind other applications to it for service discovery. And you can also monitor and manage these applications in the dashboard of Admin for Spring. Follow the steps below to create and bind a container app to the Eureka Server:
119119
120-
1. Create the container app and bind it to the Eureka Server.
120+
Create the container app and bind it to the Eureka Server.
121121
122-
```azurecli
123-
az containerapp create \
124-
--name $CLIENT_APP_NAME \
125-
--resource-group $RESOURCE_GROUP \
126-
--environment $ENVIRONMENT \
127-
--image $CLIENT_IMAGE \
128-
--min-replicas 1 \
129-
--max-replicas 1 \
130-
--ingress external \
131-
--target-port 8080 \
132-
--bind $EUREKA_COMPONENT_NAME
133-
```
122+
```azurecli
123+
az containerapp create \
124+
--name $CLIENT_APP_NAME \
125+
--resource-group $RESOURCE_GROUP \
126+
--environment $ENVIRONMENT \
127+
--image $CLIENT_IMAGE \
128+
--min-replicas 1 \
129+
--max-replicas 1 \
130+
--ingress external \
131+
--target-port 8080 \
132+
--bind $EUREKA_COMPONENT_NAME
133+
```
134134
135135
> [!TIP]
136136
> Since the Admin for Spring has been binded to the Eureka Server for Spring in previous steps. Bind the container app to the Eureka Server Java component will enable service discovery and allow to be managed through the Admin for Spring dashboard at the same time.
@@ -166,7 +166,7 @@ With the Eureka Server set up, you can now bind other applications to it for ser
166166
--query id -o tsv)
167167
```
168168
169-
1. Assign the role to the your account.
169+
1. Assign the role to your account.
170170
171171
Before running this command, replace the placeholder in between the `<>` brackets with your user or service principal ID.
172172
@@ -197,9 +197,9 @@ With the Eureka Server set up, you can now bind other applications to it for ser
197197
--query properties.ingress.fqdn -o tsv
198198
```
199199
200-
This command returns the URL you can use to access the Eureka Server for Spring dashboard. Through the dashboard, you container app is also to you as shown in the following screenshot.
200+
This command returns the URL you can use to access the Eureka Server for Spring dashboard. Through the dashboard, your container app is also to you as shown in the following screenshot.
201201
202-
:::image type="content" source="media/java-components/sba.png" alt-text="Screenshot of the Admin for Spring dashboard." lightbox="media/java-components/sba.png":::
202+
:::image type="content" source="media/java-components/spring-boot-admin.png" alt-text="Screenshot of the Admin for Spring dashboard." lightbox="media/java-components/spring-boot-admin.png":::
203203
204204
:::image type="content" source="media/java-components/eureka.png" alt-text="Screenshot of the Eureka Server for Spring dashboard." lightbox="media/java-components/eureka.png":::
205205

articles/container-apps/java-admin-for-spring-usage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: container-apps
55
author: craigshoemaker
66
ms.service: container-apps
77
ms.topic: conceptual
8-
ms.date: 07/03/2024
8+
ms.date: 07/15/2024
99
ms.author: cshoe
1010
---
1111

@@ -131,7 +131,7 @@ The following list details the admin component properties you can configure for
131131

132132
### Common configurations
133133

134-
- logging related configurations
134+
- Logging related configurations:
135135
- [**logging.level.***](https://docs.spring.io/spring-boot/docs/2.1.13.RELEASE/reference/html/boot-features-logging.html#boot-features-custom-log-levels)
136136
- [**logging.group.***](https://docs.spring.io/spring-boot/docs/2.1.13.RELEASE/reference/html/boot-features-logging.html#boot-features-custom-log-groups)
137137
- Any other configurations under `logging.*` namespace should be forbidden. For example, writing log files by using `logging.file` should be forbidden.

articles/container-apps/java-admin.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The Admin for Spring managed component offers an administrative interface for Sp
1616

1717
This tutorial shows you how to create an Admin for Spring Java component and bind it to your container app so you can monitor and manage your Spring applications with ease.
1818

19-
:::image type="content" source="media/java-components/sba-overview.png" alt-text="Overview of the Admin for Spring insights dashboard." lightbox="media/java-components/sba-overview.png":::
19+
:::image type="content" source="media/java-components/spring-boot-admin-overview.png" alt-text="Overview of the Admin for Spring insights dashboard." lightbox="media/java-components/spring-boot-admin-overview.png":::
2020

2121
In this tutorial, you learn to:
2222

@@ -67,7 +67,7 @@ The following commands help you create your resource group and Container Apps en
6767
| `LOCATION` | The Azure region location where you create your container app and Java component. |
6868
| `ENVIRONMENT` | The Azure Container Apps environment name for your demo application. |
6969
| `RESOURCE_GROUP` | The Azure resource group name for your demo application. |
70-
| `JAVA_COMPONENT_NAME` | The name of the Java component created for your container app. In this case, you create a Admin for Spring Java component. |
70+
| `JAVA_COMPONENT_NAME` | The name of the Java component created for your container app. In this case, you create an Admin for Spring Java component. |
7171
| `IMAGE` | The container image used in your container app. |
7272

7373
1. Log in to Azure with the Azure CLI.
@@ -167,7 +167,7 @@ Now that you have an existing environment, you can create your container app and
167167
--query id -o tsv)
168168
```
169169

170-
1. Assign the role to the your account.
170+
1. Assign the role to your account.
171171

172172
Before running this command, replace the placeholder in between the `<>` brackets with your user or service principal ID.
173173

@@ -178,9 +178,8 @@ Now that you have an existing environment, you can create your container app and
178178
--scope $ENVIRONMENT_ID
179179
```
180180

181-
> [!NOTE]
182-
> <USER_OR_SERVICE_PRINCIPAL_ID> usually should be the identity that you use to access Azure Portal.
183-
> <ROLE_NAME> is the name you assigned in step 1.
181+
> [!NOTE]
182+
> <USER_OR_SERVICE_PRINCIPAL_ID> usually should be the identity that you use to access Azure Portal. <ROLE_NAME> is the name you assigned in step 1.
184183

185184
1. Get the URL of the Admin for Spring dashboard.
186185

@@ -192,9 +191,9 @@ Now that you have an existing environment, you can create your container app and
192191
--query properties.ingress.fqdn -o tsv
193192
```
194193

195-
This command returns the URL you can use to access the Admin for Spring dashboard. Through the dashboard, you container app is also to you as shown in the following screenshot.
194+
This command returns the URL you can use to access the Admin for Spring dashboard. Through the dashboard, your container app is also to you as shown in the following screenshot.
196195

197-
:::image type="content" source="media/java-components/sba-alone.png" alt-text="Screenshot of the Admin for Spring dashboard." lightbox="media/java-components/sba-alone.png":::
196+
:::image type="content" source="media/java-components/spring-boot-admin-alone.png" alt-text="Screenshot of the overview the Admin for Spring dashboard." lightbox="media/java-components/spring-boot-admin-alone.png":::
198197

199198
## Clean up resources
200199

articles/container-apps/java-eureka-server.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ Now that you have an existing environment, you can create your container app and
181181
--query id -o tsv)
182182
```
183183

184-
1. Assign the role to the your account.
184+
1. Assign the role to your account.
185185

186186
Before running this command, replace the placeholder in between the `<>` brackets with your user or service principal ID.
187187

@@ -192,9 +192,8 @@ Now that you have an existing environment, you can create your container app and
192192
--scope $ENVIRONMENT_ID
193193
```
194194

195-
> [!NOTE]
196-
> <USER_OR_SERVICE_PRINCIPAL_ID> usually should be the identity that you use to access Azure Portal.
197-
> <ROLE_NAME> is the name you assigned in step 1.
195+
> [!NOTE]
196+
> <USER_OR_SERVICE_PRINCIPAL_ID> usually should be the identity that you use to access Azure Portal. <ROLE_NAME> is the name you assigned in step 1.
198197

199198
1. Get the URL of the Eureka Server for Spring dashboard.
200199

@@ -206,7 +205,7 @@ Now that you have an existing environment, you can create your container app and
206205
--query properties.ingress.fqdn -o tsv
207206
```
208207

209-
This command returns the URL you can use to access the Eureka Server for Spring dashboard. Through the dashboard, you container app is also to you as shown in the following screenshot.
208+
This command returns the URL you can use to access the Eureka Server for Spring dashboard. Through the dashboard, your container app is also to you as shown in the following screenshot.
210209

211210
:::image type="content" source="media/java-components/eureka-alone.png" alt-text="Screenshot of the Eureka Server for Spring dashboard." lightbox="media/java-components/eureka-alone.png":::
212211

0 commit comments

Comments
 (0)