Merge pull request #22 from Evilazaro:DevBoxTasks

Updating the scripts to leverage DevBox Taks for customization
Evilazaro · Mar 27, 2024 · 0a3b22b · 0a3b22b
2 parents 755df17 + 86a94b5
commit 0a3b22b
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 354 deletions.
diff --git a/Deploy/ARMTemplates/computeGallery/BackEnd-InstallWSL.ps1 b/Deploy/ARMTemplates/computeGallery/BackEnd-InstallWSL.ps1
diff --git a/Deploy/ARMTemplates/computeGallery/backEndEngineerImgTemplateFullCustomized.json b/Deploy/ARMTemplates/computeGallery/backEndEngineerImgTemplateFullCustomized.json
@@ -56,36 +56,6 @@
                         "filters": [
                             "exclude:$_.Title -like '*Preview*'"
                         ]
-                    },
-                    {
-                        "type": "PowerShell",
-                        "name": "Updating Dependencies",
-                        "inline": [
-                            "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Evilazaro/MicrosoftDevBox/main/Deploy/ARMTemplates/computeGallery/updateDependencies.ps1'));"
-                        ]
-                    },
-                    {
-                        "type": "PowerShell",
-                        "name": "Cloning GitHub Repos",
-                        "inline": [
-                            "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Evilazaro/MicrosoftDevBox/main/Deploy/ARMTemplates/computeGallery/cloneRepos.ps1'));"
-                        ]
-                    },
-                    {
-                        "type": "PowerShell",
-                        "name": "Installing Dependencies and Customizations",
-                        "inline": [
-                            "Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/Evilazaro/MicrosoftDevBox/main/Deploy/ARMTemplates/computeGallery/BackEnd-Customizations.ps1'));"
-                        ]
-                    },
-                    {
-                        "type": "PowerShell",
-                        "name": "Adding current user to docker-users group",
-                        "inline": [
-                            "Set-ExecutionPolicy Bypass -Scope Process -Force;",
-                            "Write-Host 'Adding current user to docker-users group';",
-                            "Add-LocalGroupMember -Group 'docker-users' -Member 'Everyone';"
-                        ]
                     }
                 ],
                 "distribute": [

diff --git a/Deploy/ARMTemplates/computeGallery/cloneRepos.ps1 b/Deploy/ARMTemplates/computeGallery/cloneRepos.ps1
diff --git a/Deploy/ARMTemplates/computeGallery/frontEndEngineerImgTemplate.json b/Deploy/ARMTemplates/computeGallery/frontEndEngineerImgTemplate.json
diff --git a/Deploy/ARMTemplates/devBox/devCentertemplate.json b/Deploy/ARMTemplates/devBox/devCentertemplate.json
@@ -55,27 +55,12 @@
             ],
             "properties": {
                 "gitHub": {
-                    "uri": "https://github.com/microsoft/devcenter-catalog.git",
+                    "uri": "https://github.com/Evilazaro/MicrosoftDevBox.git",
                     "branch": "main",
                     "path": "Tasks"
                 }
             }
         },
-        {
-            "type": "Microsoft.DevCenter/devcenters/catalogs",
-            "apiVersion": "2023-10-01-preview",
-            "name": "[concat(parameters('devCenterName'), '/quickstart-environment-definitions')]",
-            "dependsOn": [
-                "[resourceId('Microsoft.DevCenter/devcenters', parameters('devCenterName'))]"
-            ],
-            "properties": {
-                "gitHub": {
-                    "uri": "https://github.com/microsoft/devcenter-catalog.git",
-                    "branch": "main",
-                    "path": "Environment-Definitions"
-                }
-            }
-        },
         {
             "type": "Microsoft.DevCenter/devcenters/attachednetworks",
             "apiVersion": "2023-04-01",

diff --git a/Deploy/Bash/deploy.sh b/Deploy/Bash/deploy.sh
@@ -195,7 +195,6 @@ function buildImage
 
     declare -A image_params
     image_params["Engineer-Clean-Img"]="Engineer-Clean petv2-Fabric ./DownloadedTempTemplates/engineerCleanTemplate-Output.json https://raw.githubusercontent.com/Evilazaro/MicrosoftDevBox/$branch/Deploy/ARMTemplates/computeGallery/engineerCleanTemplate.json Contoso"
-    image_params["FrontEnd-Img"]="VSCode-FrontEnd-Docker petv2-Fabric ./DownloadedTempTemplates/FrontEnd-Docker-Output.json https://raw.githubusercontent.com/Evilazaro/MicrosoftDevBox/$branch/Deploy/ARMTemplates/computeGallery/frontEndEngineerImgTemplate.json Contoso"
     image_params["BackEnd-Docker-Img"]="VS22-BackEnd-Docker petv2-Fabric ./DownloadedTempTemplates/BackEnd-Docker-Output.json https://raw.githubusercontent.com/Evilazaro/MicrosoftDevBox/$branch/Deploy/ARMTemplates/computeGallery/backEndEngineerImgTemplateFullCustomized.json Contoso"
 
     for imageName in "${!image_params[@]}"; do