Skip to content

Commit e888d35

Browse files
cephalinCephas Lin
authored andcommitted
add missing images
1 parent 2a33ecb commit e888d35

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed
59.3 KB
Loading
35.2 KB
Loading
50.9 KB
Loading

articles/app-service/tutorial-java-tomcat-mysql-app.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ App settings are one way to keep connection secrets out of your code repository.
154154
:::row:::
155155
:::column span="2":::
156156
**Step 2:**
157-
1. In the **Application settings** tab of the **Configuration** page, find the app setting `AZURE_MYSQL_CONNECTIONSTRING`. The creation wizard has created it for you.
157+
1. In the **Application settings** tab of the **Configuration** page, find the app setting `AZURE_MYSQL_CONNECTIONSTRING`. The creation wizard created it for you.
158158
1. If you want, you can select the **Edit** button to the right of each setting and see or copy its value, or select Add to add a variable to inject into your Tomcat container. If you add an app setting that contains a valid Oracle, SQL Server, PostgreSQL, or MySQL connection string, App Service adds it as a JNDI data source in the Tomcat server's *context.xml* file.
159159
:::column-end:::
160160
:::column:::
@@ -181,7 +181,7 @@ In this step, you use the SSH connection to the app container to verify the JNDI
181181
:::row:::
182182
:::column span="2":::
183183
**Step 2:** In the SSH terminal:
184-
1. Run `cat /usr/local/tomcat/conf/context.xml`. You should see that a JNDI resource called `jdbc/AZURE_MYSQL_CONNECTIONSTRING_DS` has been added. You will use this data source later.
184+
1. Run `cat /usr/local/tomcat/conf/context.xml`. You should see that a JNDI resource called `jdbc/AZURE_MYSQL_CONNECTIONSTRING_DS` was added. You will use this data source later.
185185
:::column-end:::
186186
:::column:::
187187
:::image type="content" source="./media/tutorial-java-tomcat-mysql-app/azure-portal-check-config-in-ssh-2.png" alt-text="A screenshot showing the commands to run in the SSH shell and their output." lightbox="./media/tutorial-java-tomcat-mysql-app/azure-portal-check-config-in-ssh-2.png":::
@@ -194,7 +194,7 @@ In this step, you use the SSH connection to the app container to verify the JNDI
194194
195195
## 5. Deploy sample code
196196

197-
In this step, you'll configure GitHub deployment using GitHub Actions. It's just one of many ways to deploy to App Service, but also a great way to have continuous integration in your deployment process. By default, every `git push` to your GitHub repository will kick off the build and deploy action.
197+
In this step, you configure GitHub deployment using GitHub Actions. It's just one of many ways to deploy to App Service, but also a great way to have continuous integration in your deployment process. By default, every `git push` to your GitHub repository kicks off the build and deploy action.
198198

199199
Like the Tomcat convention, if you want to deploy to the root context of Tomcat, name your built artifact *ROOT.war*.
200200

@@ -349,7 +349,7 @@ When you're finished, you can delete all of the resources from your Azure subscr
349349
:::row:::
350350
:::column span="2":::
351351
**Step 3:**
352-
1. Enter the resource group name to confirm your deletion.
352+
1. Confirm your deletion by typing the resource group name.
353353
1. Select **Delete**.
354354
1. Confirm with **Delete** again.
355355
:::column-end:::
@@ -369,7 +369,7 @@ In this step, you create the Azure resources and deploy a sample app to App Serv
369369
1. If you haven't already, clone the sample repository's `starter-no-infra` branch in a local terminal.
370370

371371
```bash
372-
git clone -b starter-no-infra https://github.com/Azure-Samples/msdocs-tomcat-mysql-sample-app
372+
git checkout starter-no-infra
373373
cd msdocs-tomcat-mysql-sample-app
374374
```
375375

@@ -451,7 +451,7 @@ In this step, you use the SSH connection to the app container to verify the JNDI
451451
:::row:::
452452
:::column span="2":::
453453
**Step 2:** In the SSH terminal:
454-
1. Run `cat /usr/local/tomcat/conf/context.xml`. You should see that a JNDI resource called `jdbc/AZURE_MYSQL_CONNECTIONSTRING_DS` has been added. You will use this data source later.
454+
1. Run `cat /usr/local/tomcat/conf/context.xml`. You should see that a JNDI resource called `jdbc/AZURE_MYSQL_CONNECTIONSTRING_DS` was added. You will use this data source later.
455455
:::column-end:::
456456
:::column:::
457457
:::image type="content" source="./media/tutorial-java-tomcat-mysql-app/azure-portal-check-config-in-ssh-2.png" alt-text="A screenshot showing the commands to run in the SSH shell and their output." lightbox="./media/tutorial-java-tomcat-mysql-app/azure-portal-check-config-in-ssh-2.png":::
@@ -503,7 +503,7 @@ In this step, you use the SSH connection to the app container to verify the JNDI
503503

504504
## 7. Stream diagnostic logs
505505

506-
Azure App Service can capture console logs to help you diagnose issues with your application. For convenience, the azd template has already [enabled logging to the local file system](troubleshoot-diagnostic-logs.md#enable-application-logging-linuxcontainer) as well as [shipping them to a Log Analytics workspace](troubleshoot-diagnostic-logs.md#send-logs-to-azure-monitor).
506+
Azure App Service can capture console logs to help you diagnose issues with your application. For convenience, the azd template already [enabled logging to the local file system](troubleshoot-diagnostic-logs.md#enable-application-logging-linuxcontainer) and is [shipping the logs to a Log Analytics workspace](troubleshoot-diagnostic-logs.md#send-logs-to-azure-monitor).
507507

508508
The sample application includes standard Log4j logging statements to demonstrate this capability as shown below.
509509

@@ -536,7 +536,7 @@ You can ignore the warnings. The Maven Jetty plugin shows the warnings because t
536536
## Frequently asked questions
537537
538538
- [How much does this setup cost?](#how-much-does-this-setup-cost)
539-
- [How do I connect to the MySQL server that's secured behind the virtual network with other tools?](#how-do-i-connect-to-the-mysql-server-thats-secured-behind-the-virtual-network-with-other-tools)
539+
- [How do I connect to the MySQL server behind the virtual network with other tools?](#how-do-i-connect-to-the-mysql-server-thats-secured-behind-the-virtual-network-with-other-tools)
540540
- [How does local app development work with GitHub Actions?](#how-does-local-app-development-work-with-github-actions)
541541
542542
#### How much does this setup cost?
@@ -549,7 +549,7 @@ Pricing for the created resources is as follows:
549549
- The virtual network doesn't incur a charge unless you configure extra functionality, such as peering. See [Azure Virtual Network pricing](https://azure.microsoft.com/pricing/details/virtual-network/).
550550
- The private DNS zone incurs a small charge. See [Azure DNS pricing](https://azure.microsoft.com/pricing/details/dns/).
551551
552-
#### How do I connect to the MySQL database that's secured behind the virtual network with other tools?
552+
#### How do I connect to the MySQL database behind the virtual network with other tools?
553553
554554
- The Tomcat container currently doesn't have the `mysql-client` terminal too. If you want, you must manually install it. Note that anything you install won't persist across app restart.
555555
- To connect from a desktop tool like MySQL Workbench, your machine must be within the virtual network. For example, it could be an Azure VM that's connected to one of the subnets, or a machine in an on-premises network that has a [site-to-site VPN](../vpn-gateway/vpn-gateway-about-vpngateways.md) connection with the Azure virtual network.

0 commit comments

Comments
 (0)