added Dockerfile, improved UX

Author: vjirovsky-pure

01-deploy-prerequisities.sh

@@ -70,5 +70,5 @@ echo " ----------------------------------------------"
 echo ""
 echo ""
 echo ""
-echosuccess "[COMPLETED] The deployment of prerequisities has been completed. Now you can proceed to deployment of CBS with **02-deploy-cbs.sh** script file."
+echosuccess "[STEP COMPLETED] The deployment of prerequisities has been completed. Now you can proceed to deployment of CBS with **02-deploy-cbs.sh** script file."
 echo ""

02-deploy-cbs.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 set -e
-SHOW_DEBUG_OUTPUT=false
 
 source $(dirname $0)/script-modules/common.sh
 
-
 # Read the bicep parameters
 parametersfilename='./02-cbs.bicepparam'
 
@@ -60,15 +58,15 @@ enablementOutput=$(az vm image terms accept \
 accepted=`echo $enablementOutput | jq -r '.properties.outputs.accepted.value'`
 if [ $accepted ]
 then 
-    echosuccess "[COMPLETED] Plan '$AZURE_MARKETPLACE_PLAN_NAME' enabled."
+    echosuccess "[STEP COMPLETED] Plan '$AZURE_MARKETPLACE_PLAN_NAME' enabled."
 else
     echoerr "[Step #1][FAILURE] Enablement failed - offer: $AZURE_MARKETPLACE_PLAN_OFFER, plan: $AZURE_MARKETPLACE_PLAN_NAME, publisher: $AZURE_MARKETPLACE_PUBLISHER"
     echo $enablementOutput
     exit 1;
 fi
 
 echo -e "${C_BLUE3}${C_GREY85}
-[Step #2] Deploying CBS managed app:${NO_FORMAT}
+[Step #2] Deploying CBS managed app (~20mins):${NO_FORMAT} 
 "
 echo "
 Subscription Id: $subscriptionId
@@ -99,7 +97,7 @@ cbsiSCSIEndpointCT1=`echo $output | jq -r '.properties.outputs.cbsiSCSIEndpointC
 echo ""
 echo ""
 echo ""
-echosuccess "[COMPLETED] The deployment of CBS managed application has been completed."
+echosuccess "[STEP COMPLETED] The deployment of CBS managed application has been completed."
 echo ""
 
 echo " ******** Array parameters ********"

03-deploy-test-vm.sh

@@ -45,7 +45,7 @@ resourceGroupName=`echo $paramsJson | jq -r ".parameters.resourceGroupName.value
 
 
 echo -e "${C_BLUE3}${C_GREY85}
-[Step #2] Deploying VM into subscription $subscriptionId into RG ${resourceGroupName}:${NO_FORMAT}
+[Step #2] Deploying VM into subscription $subscriptionId into RG ${resourceGroupName} (~20mins):${NO_FORMAT}
 
 "
 

Dockerfile

@@ -0,0 +1,21 @@
+FROM ubuntu:22.10
+
+RUN apt-get update && apt-get install -y \
+    jq \
+    curl \
+    libicu-dev
+
+RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
+
+RUN az bicep install
+
+# install bicep
+RUN curl -sLo bicep https://github.com/Azure/bicep/releases/latest/download/bicep-linux-x64 \
+    && chmod +x ./bicep \
+    && mv ./bicep /usr/local/bin/bicep \
+    && bicep --version
+
+VOLUME [ "/data" ]
+WORKDIR /data
+
+CMD ["/bin/bash", "-c", "az login && bash"]

README.md

@@ -2,13 +2,33 @@
 
 ## Prerequisites
 - bash
-- Windows (**WSL recommended**) / Linux<sup>[1]</sup> / MacOS<sup>[2]</sup>
-- `az-cli`, `bicep-cli`, `jq` (all should get installed with setup-machine script)
+- Docker or Windows (**WSL recommended**) / Linux<sup>[1]</sup> / MacOS<sup>[2]</sup>
+- `az-cli`, `bicep-cli`, `jq` (all should get installed with setup-machine script or included in the Dockerfile)
 
-<small><sup>[1],[2]</sup> not fully tested, please report any issue you find</small>
+<small><sup>[1],[2]</sup> these OS are not fully tested, please report any issue you find</small>
 
 ## Installation
 
+You can also run all commands in this repo on your computer or in container using the prepared Dockerfile in the repo.
+
+
+### In Docker container
+
+1. Build the container image with command:
+    ```bash
+    $ docker build . -t cbs-bicep
+    ```
+1. Run the container:
+    ```bash
+    $ docker run -v .:/data -it cbs-bicep
+    ```
+1. Follow instructions on screen to authenticate into Azure CLI via device code login method.
+
+<br>
+<i>or:</i>
+<br>
+
+### On local computer
 
 1. Add permissions to execute scripts:
 ```bash

deploy-e2e-demo.sh

@@ -66,13 +66,13 @@ echo " ----------------------------------------------"
 echo ""
 echo ""
 echo ""
-echosuccess "[COMPLETED] The deployment of prerequisities has been completed."
+echosuccess "[STEP COMPLETED] The deployment of prerequisities has been completed."
 echo ""
 
 # Read the bicep parameters for CBS
 mainfilename='./templates/cbs-managed-app.bicep'
-tmpfilename='./templates/02-cbs.bicepparam'
-bicep_raw=`bicep generate-params $mainfilename --output-format bicepparam --outfile $tmpfilename`
+tmpfilename='./templates/tmp-e2e-02.bicepparam'
+bicep_gen_raw=`bicep generate-params $mainfilename --output-format bicepparam --outfile $tmpfilename`
 bicep_raw=`bicep build-params $tmpfilename --stdout`
 paramsJson=`echo $bicep_raw | jq -r ".parametersJson"`
 
@@ -96,15 +96,15 @@ enablementOutput=$(az vm image terms accept \
 accepted=`echo $enablementOutput | jq -r '.properties.outputs.accepted.value'`
 if [ $accepted ]
 then 
-    echosuccess "[COMPLETED] Plan '$AZURE_MARKETPLACE_PLAN_NAME' enabled."
+    echosuccess "[STEP COMPLETED] Plan '$AZURE_MARKETPLACE_PLAN_NAME' enabled."
 else
     echoerr "[Step #2][FAILURE] Enablement failed - offer: $AZURE_MARKETPLACE_PLAN_OFFER, plan: $AZURE_MARKETPLACE_PLAN_NAME, publisher: $AZURE_MARKETPLACE_PUBLISHER"
     echo $enablementOutput
     exit 1;
 fi
 
 echo -e "${C_BLUE3}${C_GREY85}
-[Step #3] Deploying CBS managed app:${NO_FORMAT}
+[Step #3] Deploying CBS managed app (~20mins):${NO_FORMAT}
 "
 
 # Deploy our infrastructure
@@ -141,7 +141,7 @@ cbsiSCSIEndpointCT1=`echo $output | jq -r '.properties.outputs.cbsiSCSIEndpointC
 echo ""
 echo ""
 echo ""
-echosuccess "[COMPLETED] The deployment of CBS managed application has been completed."
+echosuccess "[STEP COMPLETED] The deployment of CBS managed application has been completed."
 echo ""
 
 echo " ******** Array parameters ********"
@@ -188,7 +188,7 @@ fi
 
 
 echo -e "${C_BLUE3}${C_GREY85}
-[Step #5] Deploying VM into subscription $subscriptionId into RG ${resourceGroupName}:${NO_FORMAT}
+[Step #5] Deploying VM into subscription $subscriptionId into RG ${resourceGroupName} (~20mins):${NO_FORMAT}
 
 "