Skip to content

Commit a572a9f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-mqtt-m2-updates
2 parents b78413d + 1e0af9b commit a572a9f

File tree

67 files changed

+1251
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1251
-352
lines changed

.openpublishing.build.ps1

Lines changed: 0 additions & 17 deletions
This file was deleted.

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,12 @@
590590
"branch": "main",
591591
"branch_mapping": {}
592592
},
593+
{
594+
"path_to_root": "msdocs-jboss-mysql-sample-app",
595+
"url": "https://github.com/Azure-Samples/msdocs-jboss-mysql-sample-app",
596+
"branch": "main",
597+
"branch_mapping": {}
598+
},
593599
{
594600
"path_to_root": "playwright-testing-service",
595601
"url": "https://github.com/microsoft/playwright-testing-service",

articles/app-service/deploy-github-actions.md

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -234,12 +234,13 @@ The following examples show the part of the workflow that builds the web app, in
234234

235235
## Frequently Asked Questions
236236

237-
- [How do I deploy a WAR file through Maven plugin and OpenID Connect](#how-do-i-deploy-a-war-file-through-maven-plugin-and-openid-connect)
238-
- [How do I deploy a WAR file through Az CLI and OpenID Connect](#how-do-i-deploy-a-war-file-through-az-cli-and-openid-connect)
239-
- [How do I deploy to a Container](#how-do-i-deploy-to-a-container)
240-
- [How do I update the Tomcat configuration after deployment](#how-do-i-update-the-tomcat-configuration-after-deployment)
237+
- [How do I deploy a WAR file through Maven plugin?](#how-do-i-deploy-a-war-file-through-maven-plugin)
238+
- [How do I deploy a WAR file through Az CLI?](#how-do-i-deploy-a-war-file-through-az-cli)
239+
- [How do I deploy a startup file?](#how-do-i-deploy-a-startup-file)
240+
- [How do I deploy to a Container?](#how-do-i-deploy-to-a-container)
241+
- [How do I update the Tomcat configuration after deployment?](#how-do-i-update-the-tomcat-configuration-after-deployment)
241242

242-
### How do I deploy a WAR file through Maven plugin and OpenID Connect
243+
### How do I deploy a WAR file through Maven plugin?
243244

244245
In case you configured your Java Tomcat project with the [Maven plugin](https://github.com/microsoft/azure-maven-plugins), you can also deploy to Azure App Service through this plugin. If you use the [Azure CLI GitHub action](https://github.com/Azure/cli) it will make use of your Azure login credentials.
245246

@@ -254,26 +255,38 @@ In case you configured your Java Tomcat project with the [Maven plugin](https://
254255
More information on the Maven plugin and how to use and configure it can be found in the [Maven plugin wiki for Azure App Service](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App).
255256

256257

257-
### How do I deploy a WAR file through Az CLI and OpenID Connect
258+
### How do I deploy a WAR file through Az CLI?
258259

259-
If you use prefer the Azure CLI to deploy to App Service, you can use the GitHub Action for CLI.
260+
If you use prefer the Azure CLI to deploy to App Service, you can use the GitHub Action for Azure CLI.
260261

261262
```yaml
262-
- name: Azure CLI script
263-
uses: azure/cli@v2
264-
with:
265-
inlineScript: |
266-
az webapp deploy --src-path '${{ github.workspace }}/target/yourpackage.war' --name ${{ env.AZURE_WEBAPP_NAME }} --resource-group ${{ env.RESOURCE_GROUP }} --async true --type war
263+
- name: Azure CLI script
264+
uses: azure/cli@v2
265+
with:
266+
inlineScript: |
267+
az webapp deploy --src-path '${{ github.workspace }}/target/yourpackage.war' --name ${{ env.AZURE_WEBAPP_NAME }} --resource-group ${{ env.RESOURCE_GROUP }} --async true --type war
267268
```
268269

269270
More information on the GitHub Action for CLI and how to use and configure it can be found in the [Azure CLI GitHub action](https://github.com/Azure/cli).
270-
More information on the az webapp deploy command, how to use and the parameter details can be found in the [az webapp deploy documentation](/cli/azure/webapp?view=azure-cli-latest#az-webapp-deploy).
271+
More information on the az webapp deploy command, how to use and the parameter details can be found in the [az webapp deploy documentation](/cli/azure/webapp#az-webapp-deploy).
272+
273+
### How do I deploy a startup file?
274+
275+
Use the GitHub Action for CLI. For example:
276+
277+
```yaml
278+
- name: Deploy startup script
279+
uses: azure/cli@v2
280+
with:
281+
inlineScript: |
282+
az webapp deploy --src-path ${{ github.workspace }}/src/main/azure/createPasswordlessDataSource.sh --name ${{ env.AZURE_WEBAPP_NAME }} --resource-group ${{ env.RESOURCE_GROUP }} --type startup --track-status false
283+
```
271284

272-
### How do I deploy to a Container
285+
### How do I deploy to a Container?
273286

274287
With the Azure Web Deploy action, you can automate your workflow to deploy custom containers to App Service using GitHub Actions. Detailed information on the steps to deploy using GitHub Actions, can be found in the [Deploy to a Container](/azure/app-service/deploy-container-github-action).
275288

276-
### How do I update the Tomcat configuration after deployment
289+
### How do I update the Tomcat configuration after deployment?
277290

278291
In case you would like to update any of your web apps settings after deployment, you can use the [App Service Settings](https://github.com/Azure/appservice-settings) action.
279292

104 KB
Loading
41.9 KB
Loading
39.5 KB
Loading
167 KB
Loading
91.3 KB
Loading
107 KB
Loading
77.7 KB
Loading

0 commit comments

Comments
 (0)