From 809cb01be3d3f759be8694a39eb4184b06ff7fb5 Mon Sep 17 00:00:00 2001
From: dstrebel <strebeld@gmail.com>
Date: Tue, 18 Sep 2018 21:53:33 -0500
Subject: [PATCH] now it's even more fixed

---
 labs/build-application/README.md | 59 --------------------------------
 1 file changed, 59 deletions(-)

diff --git a/labs/build-application/README.md b/labs/build-application/README.md
index 65b26759..c59eb1b8 100644
--- a/labs/build-application/README.md
+++ b/labs/build-application/README.md
@@ -13,22 +13,6 @@ In this lab we will build Docker containers for each of the application componen
 1. Create Azure Container Registry (ACR)
     * Use the same resource group that was created for AKS (in lab 1)
     * In this step, you will need a unique name for your ACR instance. Use the following step to create the ACR name and then deploy.
-<<<<<<< HEAD
-        ```bash
-        export ACRNAME=acrhackfest$UNIQUE_SUFFIX
-        ```
-        ```bash
-        az acr create --resource-group $RGNAME --name $ACRNAME --sku Basic
-        ```
-2. Run bash script to authenticate with Azure Container Registry from AKS
-    * Running this script will grant the Service Principal created at cluster creation time access to ACR.
-      ```bash
-      cd ~/kubernetes-hackfest/labs/build-application
-      ```
-      ```bash
-       sh reg-acr.sh $RGNAME $CLUSTERNAME $ACRNAME
-      ```
-=======
 
     ```bash
     # Use the UNIQUE_SUFFIX from the first lab. Validate that the value is still set.
@@ -53,25 +37,11 @@ In this lab we will build Docker containers for each of the application componen
 
     sh reg-acr.sh $RGNAME $CLUSTERNAME $ACRNAME
     ```
->>>>>>> e71d99301b775a8036d6541ca333a029881299c2
 
 2. Deploy Cosmos DB
     
     In this step, create a Cosmos DB account for the Mongo api. Again, we will create a random, unique name.
         
-<<<<<<< HEAD
-        # Use the UNIQUE_SUFFIX from the first lab. Validate that the value is still set.
-
-        ```bash
-        echo export COSMOSNAME=cosmos$UNIQUE_SUFFIX >> ~/.bashrc
-        ```
-        ```bash
-        source ~/.bashrc
-        ```
-        ```bash
-        az cosmosdb create --name $COSMOSNAME --resource-group $RGNAME --kind MongoDB
-        ```
-=======
     ```bash
     echo export COSMOSNAME=cosmos$UNIQUE_SUFFIX >> ~/.bashrc
     ```
@@ -81,30 +51,11 @@ In this lab we will build Docker containers for each of the application componen
     ```bash
     az cosmosdb create --name $COSMOSNAME --resource-group $RGNAME --kind MongoDB
     ```
->>>>>>> e71d99301b775a8036d6541ca333a029881299c2
     
     You can validate your Cosmos instance in the portal. The credentials and connect string will be used in the next lab.
 
 
 3. Create Docker containers in ACR
-<<<<<<< HEAD
-    * In this step we will create a Docker container image for each of our microservices. We will use ACR Builder functionality to build and store these images in the cloud. 
-
-        ```bash
-        cd ~/kubernetes-hackfest
-        ```
-        # set a version (make this anything you would like)
-        ```bash
-        export VERSION=v4
-        ```
-        ```bash
-        az acr build -t hackfest/data-api:$VERSION -r $ACRNAME --no-logs ./app/data-api
-        az acr build -t hackfest/flights-api:$VERSION -r $ACRNAME --no-logs ./app/flights-api
-        az acr build -t hackfest/quakes-api:$VERSION -r $ACRNAME --no-logs ./app/quakes-api
-        az acr build -t hackfest/weather-api:$VERSION -r $ACRNAME --no-logs ./app/weather-api
-        az acr build -t hackfest/service-tracker-ui:$VERSION -r $ACRNAME --no-logs ./app/service-tracker-ui
-        ```
-=======
     
     In this step we will create a Docker container image for each of our microservices. We will use ACR Builder functionality to build and store these images in the cloud. 
 
@@ -117,24 +68,14 @@ In this lab we will build Docker containers for each of the application componen
     az acr build -t hackfest/weather-api:1.0 -r $ACRNAME --no-logs ./app/weather-api
     az acr build -t hackfest/service-tracker-ui:1.0 -r $ACRNAME --no-logs ./app/service-tracker-ui
     ```
->>>>>>> e71d99301b775a8036d6541ca333a029881299c2
 
     You can see the status of the builds by running the command below.
         
-<<<<<<< HEAD
-        ```bash
-        az acr build-task list-builds -r $ACRNAME -o table
-        ```
-        ```bash
-        az acr build-task logs -r $ACRNAME --build-id aa1
-        ```
-=======
     ```
     az acr build-task list-builds -r $ACRNAME -o table
 
     az acr build-task logs -r $ACRNAME --build-id aa1
     ```
->>>>>>> e71d99301b775a8036d6541ca333a029881299c2
     
     Browse to your ACR instance in the Azure portal and validate that the images are in "Repositories."