fixing pivot issues with code tabs and look when using them as if/else

Author: Simon Jakesch

articles/container-apps/quickstart-code-to-cloud.md

@@ -144,7 +144,7 @@ Download and extract the API sample application in the language of your choice.
 
 # [C#](#tab/csharp)
 
-[Download the source code](https://codeload.github.com/azure-samples/containerapps-albumapi-csharp/zip/refs/heads/main) from the [azure-samples/containerapps-albumapi-csharp repo](https://github.com/azure-samples/containerapps-albumapi-csharp).
+[Download the source code](https://codeload.github.com/azure-samples/containerapps-albumapi-csharp/zip/refs/heads/main) to your machine.
 
 Extract the download and change into the *containerapps-albumapi-csharp-main/src* folder.
 
@@ -155,9 +155,6 @@ Extract the download and change into the *containerapps-albumapi-csharp-main/src
 
 Extract the download and change into the *containerapps-albumapi-java-main/src* folder.
 
-> [!NOTE] 
-> The Java sample only supports a Maven build, which creates an executable JAR file. The build uses the default settings, as passing in environment variables is not supported.
-
 
 # [JavaScript](#tab/javascript)
 
@@ -175,9 +172,9 @@ Extract the download and change into the *containerapps-albumapi-python-main/src
 
 # [Go](#tab/go)
 
-[Download the source code](https://codeload.github.com/azure-samples/containerapps-albumapi-go/zip/refs/heads/main) from the [azure-samples/containerapps-albumapi-csharp repo](https://github.com/azure-samples/containerapps-albumapi-go).
+[Download the source code](https://codeload.github.com/azure-samples/containerapps-albumapi-go/zip/refs/heads/main) to your machine.
 
-Extract the download and navigate into the `containerapps-albumapi-go-main/src` directory and proceed to the next step.
+Extract the download and navigate into the *containerapps-albumapi-go-main/src* folder.
 
 
 ::: zone-end
@@ -217,7 +214,7 @@ Extract the download and navigate into the `containerapps-albumapi-python-buildp
 
 # [Go](#tab/go)
 
-Azure Container Apps cloud build doesn't support Buildpacks for Go.
+Azure Container Apps cloud build doesn't currently support Buildpacks for Go.
 
 ::: zone-end
 
@@ -230,19 +227,22 @@ Azure Container Apps cloud build doesn't support Buildpacks for Go.
 
 Build and deploy your first container app with the `containerapp up` command. This command will:
 
-- Create the resource group
 ::: zone pivot="with-dockerfile"
+- Create the resource group
 - Create an Azure Container Registry
 - Build the container image and push it to the registry
+- Create the Container Apps environment with a Log Analytics workspace
+- Create and deploy the container app using the built container image
 ::: zone-end
+
 ::: zone pivot="without-dockerfile"
-- Automatically create a default registry as part of your environment
-- Automatically detect the language and runtime
-- Build the image using the appropriate Buildpack
+- Create the resource group
+- Create a default registry as part of your environment
+- Detect the language and runtime of your application and build the image using the appropuiate Buildpack
 - Push the image into the Azure Container Apps default registry
-::: zone-end
 - Create the Container Apps environment with a Log Analytics workspace
-- Create and deploy the container app using the build container image
+- Create and deploy the container app using the built container image
+::: zone-end
 
 ::: zone pivot="with-dockerfile"
 
@@ -251,7 +251,7 @@ The `up` command uses the Dockerfile in the root of the repository to build the
 ::: zone-end
 ::: zone pivot="without-dockerfile"
 
-If the `up` command doesn't find a Dockerfile, it automatically uses Buildpacks to turn your application source into a runnable container. Since the Buildpack is trying to run the build on your behalf, you need to tell the `up` command which port to use.
+If the `up` command doesn't find a Dockerfile, it automatically uses Buildpacks to turn your application source into a runnable container. Since the Buildpack is trying to run the build on your behalf, you need to tell the `up` command which port to send ingress traffic to.
 
 ::: zone-end
 

articles/container-apps/quickstart-repo-to-cloud.md

@@ -169,81 +169,122 @@ $ACR_NAME="acaalbums"+$GITHUB_USERNAME
 
 ## Prepare the GitHub repository
 
-In a browser window, go to the GitHub repository for your preferred language and fork the repository.
+::: zone pivot="with-dockerfile"
+
+In a browser window, go to the GitHub repository for your preferred language and fork the repository. 
 
 # [C#](#tab/csharp)
 
-Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-csharp) to fork the repo to your account.
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-csharp) to fork the repo to your account. Then copy the repo URL to use it
+in the next step.
+
+
+# [Java](#tab/java)
+
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-java) to fork the repo to your account. Then copy the repo URL to use it
+in the next step.
+
+
+# [JavaScript](#tab/javascript)
+
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-javascript) to fork the repo to your account. Then copy the repo URL to use it
+in the next step.
+
+
+# [Python](#tab/python)
+
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-python) to fork the repo to your account. Then copy the repo URL to use it
+in the next step.
+
+
+# [Go](#tab/go)
+
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-go) to fork the repo to your account. Then copy the repo URL to use it
+in the next step.
+
+::: zone-end
 
 
 ::: zone pivot="without-dockerfile"
 
-# [Java](#tab/java)
+In a browser window, go to the GitHub repository for your preferred language and fork the repository **including branches**. 
+
+# [C#](#tab/csharp)
 
-Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-java) to fork the repo to your account.
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-csharp) to fork the repo to your account. Uncheck "Copy the `main` branch only"
+to also fork the `buildpack` branch.
 
-> [!NOTE] 
-> The Java sample only supports a Maven build, which results in an executable JAR file. The build uses the default settings, as passing in environment variables is not supported.
 
-:::zone-end
+# [Java](#tab/java)
+
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-java) to fork the repo to your account. Uncheck "Copy the `main` branch only"
+to also fork the `buildpack` branch.
 
 
 # [JavaScript](#tab/javascript)
 
-Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-javascript) to fork the repo to your account.
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-javascript) to fork the repo to your account. Uncheck "Copy the `main` branch only"
+to also fork the `buildpack` branch.
 
 
 # [Python](#tab/python)
 
-Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-python) to fork the repo to your account.
-
+Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-python) to fork the repo to your account. Uncheck "Copy the `main` branch only"
+to also fork the `buildpack` branch.
 
-::: zone pivot="with-dockerfile"
 
 # [Go](#tab/go)
 
-Select the **Fork** button at the top of the [album API repo](https://github.com/azure-samples/containerapps-albumapi-go) to fork the repo to your account.
+Azure Container Apps cloud build doesn't currently support Buildpacks for Go.
 
 ::: zone-end
 
+
 ---
 
 ## Build and deploy the container app
 
 Build and deploy your first container app from your forked GitHub repository with the `containerapp up` command. This command will:
 
+::: zone pivot="with-dockerfile"
 - Create the resource group
 - Create the Container Apps environment with a Log Analytics workspace
-::: zone pivot="with-dockerfile"
 - Create an Azure Container Registry
+- Create a GitHub Action workflow to build and deploy the container app
 ::: zone-end
+
 ::: zone pivot="without-dockerfile"
+- Create the resource group
+- Create the Container Apps environment with a Log Analytics workspace
 - Automatically create a default registry as part of your environment
-::: zone-end
 - Create a GitHub Action workflow to build and deploy the container app
+::: zone-end
 
 When you push new code to the repository, the GitHub Action will:
 
 ::: zone pivot="with-dockerfile"
 - Build the container image and push it to the Azure Container Registry
 - Deploy the container image to the created container app
+
+The `up` command uses the Dockerfile in the root of the repository to build the container image. The target port is defined by the EXPOSE instruction in the Dockerfile.  A Docker file isn't required to build a container app. 
 ::: zone-end
+
 ::: zone pivot="without-dockerfile"
 - Automatically detect the language and runtime
 - Build the image using the appropriate Buildpack
 - Push the image into the Azure Container Apps default registry
+
+The container app needs to be accessible to ingress traffic. Ensure to expose port 8080 to listen for incoming requests.
 ::: zone-end
 
 ::: zone pivot="with-dockerfile"
-The `up` command uses the Dockerfile in the root of the repository to build the container image. The target port is defined by the EXPOSE instruction in the Dockerfile.  A Docker file isn't required to build a container app. 
+In the command below, replace the `<YOUR_GITHUB_REPOSITORY_NAME>` with your GitHub repository name in the form of `https://github.com/<OWNER>/<REPOSITORY-NAME>` or `<OWNER>/<REPOSITORY-NAME>`.
 ::: zone-end
 
 ::: zone pivot="without-dockerfile"
-The container app needs to be accessible to ingress traffic. Ensure to expose port 8080 to listen for incoming requests.
+In the command below, replace the `<YOUR_GITHUB_REPOSITORY_NAME>` with your GitHub repository name in the form of `https://github.com/<OWNER>/<REPOSITORY-NAME>` or `<OWNER>/<REPOSITORY-NAME>`. Use the `--branch buildpack` option to point to the sample source without a Dockerfile.
 ::: zone-end
 
-In the command below, replace the `<YOUR_GITHUB_REPOSITORY_NAME>` with your GitHub repository name in the form of `https://github.com/<OWNER>/<REPOSITORY-NAME>` or `<OWNER>/<REPOSITORY-NAME>`.
-
 # [Bash](#tab/bash)
 
 ::: zone pivot="with-dockerfile"
@@ -271,6 +312,8 @@ az containerapp up \
   --ingress external \
   --target-port 8080 \
   --repo <YOUR_GITHUB_REPOSITORY_NAME>
+  --branch buildpack
+  --
 ```
 
 ::: zone-end
@@ -303,6 +346,7 @@ az containerapp up `
     --ingress external `
     --target-port 8080 `
     --repo <YOUR_GITHUB_REPOSITORY_NAME>
+    --branch buildpack
 ```
 
 ::: zone-end