diff --git a/articles/app-service-web/app-service-linux-faq.md b/articles/app-service-web/app-service-linux-faq.md index b8463b1d37e46..223f84f7c2df7 100644 --- a/articles/app-service-web/app-service-linux-faq.md +++ b/articles/app-service-web/app-service-linux-faq.md @@ -51,7 +51,7 @@ If you have a question, comment on the article and we'll answer it as soon as po **Q:** My web app still uses an old Docker container image after I've updated the image on Docker Hub. Do you support continuous integration/deployment of custom containers? -**A:** To set up continuous integration/deployment for DockerHub images by check the following article [Docker Hub Continuous Deployment with Web App on Linux](./app-service-linux-ci-cd.md). For private registries, you can refresh the container by stopping and then starting your web app. Or you can change or add a dummy application setting to force a refresh of your container. +**A:** To set up continuous integration/deployment for Azure Container Registry or DockerHub images by check the following article [Continuous Deployment with Azure Web App on Linux](./app-service-linux-ci-cd.md). For private registries, you can refresh the container by stopping and then starting your web app. Or you can change or add a dummy application setting to force a refresh of your container. **Q:** Do you support staging environments? @@ -59,7 +59,7 @@ If you have a question, comment on the article and we'll answer it as soon as po **Q:** Can I use **web deploy** to deploy my web app? -**A:** Yes, you need to set an app setting called `UseWebDeployScm` to `false`. +**A:** Yes, you need to set an app setting called `WEBSITE_WEBDEPLOY_USE_SCM` to `false`. ## Language support @@ -99,7 +99,7 @@ If you have a question, comment on the article and we'll answer it as soon as po **Q:** My custom container listens to a port other than port 80. How can I configure my app to route the requests to that port? -**A:** We have auto port detection, also you can specify an application setting called **PORT**, and give it the value of the expected port number. +**A:** We have auto port detection, also you can specify an application setting called **WEBSITES_PORT**, and give it the value of the expected port number. Previously the platform was using `PORT` app setting, we are planning to deprecate the use this app setting and move to using `WEBSITES_PORT` exclusively. **Q:** Do I need to implement HTTPS in my custom container. @@ -126,4 +126,4 @@ If you have a question, comment on the article and we'll answer it as soon as po * [Creating web apps in Azure Web App on Linux](app-service-linux-how-to-create-web-app.md) * [SSH support for Azure Web App on Linux](./app-service-linux-ssh-support.md) * [Set up staging environments in Azure App Service](./web-sites-staged-publishing.md) -* [Docker Hub Continuous Deployment with Azure Web App on Linux](./app-service-linux-ci-cd.md) +* [Continuous Deployment with Azure Web App on Linux](./app-service-linux-ci-cd.md) diff --git a/articles/app-service-web/app-service-linux-intro.md b/articles/app-service-web/app-service-linux-intro.md index 8e2aab75b80df..ae9959455c225 100644 --- a/articles/app-service-web/app-service-linux-intro.md +++ b/articles/app-service-web/app-service-linux-intro.md @@ -65,8 +65,8 @@ For Kudu, some of the basic functionality: For devops: -* Staging environments -* DockerHub CI/CD +* Deployment Slots +* ACR and DockerHub CI/CD ## Limitations The Azure portal shows only features that currently work for Web App on Linux and hides the rest. As we enable more features, they will be visible on the portal. @@ -79,6 +79,7 @@ This public preview is currently only available in the following regions: * West Europe * Southeast Asia * Australia East +* Japan East Web Apps on Linux is only supported in the Dedicated app service plans and does not have a Free or Shared tier. Also, App Service plans for regular and Linux web apps are mutually exclusive, so you cannot create a Linux web app in a non-Linux app service plan. diff --git a/articles/app-service-web/app-service-linux-ssh-support.md b/articles/app-service-web/app-service-linux-ssh-support.md index ce9188e1fc652..4c9323686066e 100644 --- a/articles/app-service-web/app-service-linux-ssh-support.md +++ b/articles/app-service-web/app-service-linux-ssh-support.md @@ -51,7 +51,7 @@ If you are not already authenticated, you are required to authenticate with your In order for a custom Docker image to support SSH communication between the container and the client in the Azure portal, perform the following steps for your Docker image. -These steps are are shown in the Azure App Service repository as an example [here](https://github.com/Azure-App-Service/node/tree/master/4.4.7-1). +These steps are are shown in the Azure App Service repository as an example [here](https://github.com/Azure-App-Service/node/blob/master/6.9.3/). 1. Include the `openssh-server` installation in [`RUN` instruction](https://docs.docker.com/engine/reference/builder/#run) in the Dockerfile for your image and set the password for the root account to `"Docker!"`. diff --git a/articles/app-service-web/app-service-linux-using-custom-docker-image.md b/articles/app-service-web/app-service-linux-using-custom-docker-image.md index ff58a7cc50957..ec66857ac3022 100644 --- a/articles/app-service-web/app-service-linux-using-custom-docker-image.md +++ b/articles/app-service-web/app-service-linux-using-custom-docker-image.md @@ -28,7 +28,7 @@ App Service provides pre-defined application stacks on Linux with support for sp ## How to: set a custom Docker image for a web app -You can set the custom Docker image for both new and existing webs apps. When you create a web app on Linux in the [Azure portal](https://portal.azure.com), click **Configure container** to set a custom Docker image: +You can set the custom Docker image for both new and existing webs apps. When you create a web app on Linux in the [Azure portal](https://portal.azure.com/#create/Microsoft.AppSvcLinux), click **Configure container** to set a custom Docker image: ![Custom Docker Image for a new web app on Linux][1] @@ -60,18 +60,20 @@ To use a custom Docker image from a private image registry: ## How to: set the port used by your Docker image ## -When you use a custom Docker image for your web app, you can use the `PORT` environment variable in your Dockerfile, which gets added to the generated container. Consider the following example of a docker file for a Ruby application: +When you use a custom Docker image for your web app, you can use the `WEBSITES_PORT` environment variable in your Dockerfile, which gets added to the generated container. Consider the following example of a docker file for a Ruby application: FROM ruby:2.2.0 RUN mkdir /app WORKDIR /app ADD . /app RUN bundle install - CMD bundle exec puma config.ru -p $PORT -e production + CMD bundle exec puma config.ru -p WEBSITES_PORT -e production -On last line of the command, you can see that the PORT environment variable is passed at runtime. Remember that casing matters in commands. +On last line of the command, you can see that the WEBSITES_PORT environment variable is passed at runtime. Remember that casing matters in commands. -When you use an existing Docker image built by someone else, you may need to specify a port other than port 80 for the application. To configure the port, add an application setting named `PORT` with the value as shown below: +Previously the platform was using `PORT` app setting, we are planning to deprecate the use this app setting and move to using `WEBSITES_PORT` exclusively. + +When you use an existing Docker image built by someone else, you may need to specify a port other than port 80 for the application. To configure the port, add an application setting named `WEBSITES_PORT` with the value as shown below: ![Configure PORT app setting for custom Docker image][6] @@ -89,8 +91,8 @@ To switch from using a custom image to using a built-in image: ## Troubleshooting ## -When your application fails to start with your custom Docker image, check the Docker logs in the LogFiles/docker directory. You can access this directory either through your SCM site or via FTP. -To log the `stdout` and `stderr` from your container, you need to enable **Web server logging** under **Diagnostics Logs**. +When your application fails to start with your custom Docker image, check the Docker logs in the LogFiles directory. You can access this directory either through your SCM site or via FTP. +To log the `stdout` and `stderr` from your container, you need to enable **Docker Container logging** under **Diagnostics Logs**. ![Enabling Logging][8] diff --git a/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/application-settings-change-stack.png b/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/application-settings-change-stack.png index ffdd9dfac931a..ef5539f0d8657 100644 Binary files a/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/application-settings-change-stack.png and b/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/application-settings-change-stack.png differ diff --git a/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/create-blade.png b/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/create-blade.png index 722b95fc4643b..c6a7712607b84 100644 Binary files a/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/create-blade.png and b/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/create-blade.png differ diff --git a/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/diagnostic-logs-ftp.png b/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/diagnostic-logs-ftp.png index e25d51bde9d7b..8f42372baa80e 100644 Binary files a/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/diagnostic-logs-ftp.png and b/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/diagnostic-logs-ftp.png differ diff --git a/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/top-level-create.png b/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/top-level-create.png index 170cc02b3d633..e995b466ebd54 100644 Binary files a/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/top-level-create.png and b/articles/app-service-web/media/app-service-linux-how-to-create-a-web-app/top-level-create.png differ diff --git a/articles/app-service-web/media/app-service-linux-ruby-get-started/create-blade.png b/articles/app-service-web/media/app-service-linux-ruby-get-started/create-blade.png index cb6063b99445c..68b9e72857e93 100644 Binary files a/articles/app-service-web/media/app-service-linux-ruby-get-started/create-blade.png and b/articles/app-service-web/media/app-service-linux-ruby-get-started/create-blade.png differ diff --git a/articles/app-service-web/media/app-service-linux-ruby-get-started/top-level-create.png b/articles/app-service-web/media/app-service-linux-ruby-get-started/top-level-create.png index 170cc02b3d633..e995b466ebd54 100644 Binary files a/articles/app-service-web/media/app-service-linux-ruby-get-started/top-level-create.png and b/articles/app-service-web/media/app-service-linux-ruby-get-started/top-level-create.png differ diff --git a/articles/app-service-web/media/app-service-linux-using-custom-docker-image/kudu-docker-logs.png b/articles/app-service-web/media/app-service-linux-using-custom-docker-image/kudu-docker-logs.png index c55cbe8dc2686..b5e3f9384b097 100644 Binary files a/articles/app-service-web/media/app-service-linux-using-custom-docker-image/kudu-docker-logs.png and b/articles/app-service-web/media/app-service-linux-using-custom-docker-image/kudu-docker-logs.png differ diff --git a/articles/app-service-web/media/app-service-linux-using-custom-docker-image/logging.png b/articles/app-service-web/media/app-service-linux-using-custom-docker-image/logging.png index f1f27174f54c8..5d2cc7a27fe71 100644 Binary files a/articles/app-service-web/media/app-service-linux-using-custom-docker-image/logging.png and b/articles/app-service-web/media/app-service-linux-using-custom-docker-image/logging.png differ diff --git a/articles/app-service-web/media/app-service-linux-using-custom-docker-image/setting-port.png b/articles/app-service-web/media/app-service-linux-using-custom-docker-image/setting-port.png index 1b27dfea68601..8fdcb1c6e03cc 100644 Binary files a/articles/app-service-web/media/app-service-linux-using-custom-docker-image/setting-port.png and b/articles/app-service-web/media/app-service-linux-using-custom-docker-image/setting-port.png differ