Merge pull request #709 from ministryofjustice/dso/add-install-git-wi…

…ndows-component Dso/add install git windows component
ministryofjustice · Feb 12, 2024 · f798227 · f798227
2 parents 5d4cd07 + 658a8e5
commit f798227
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 7 deletions.
diff --git a/commonimages/base/windows_2012_r2/locals.tf b/commonimages/base/windows_2012_r2/locals.tf
@@ -7,14 +7,19 @@ locals {
     },
     {
       name       = "powershell_core_server_2012"
-      version    = "0.0.3"
+      version    = "0.0.4"
       parameters = []
     },
     {
       name       = "aws_cli"
       version    = "0.0.4"
       parameters = []
     },
+    {
+      name       = "git_windows"
+      version    = "0.0.2"
+      parameters = []
+    }
   ]
 
   component_template_args = {}

diff --git a/commonimages/base/windows_2012_r2/terraform.tfvars b/commonimages/base/windows_2012_r2/terraform.tfvars
@@ -4,7 +4,7 @@
 
 region                = "eu-west-2"
 ami_base_name         = "windows_server_2012_r2"
-configuration_version = "0.1.9"
+configuration_version = "0.2.1"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "Windows Server 2012 R2"
 

diff --git a/commonimages/base/windows_2012_r2_SQL_2014/locals.tf b/commonimages/base/windows_2012_r2_SQL_2014/locals.tf
@@ -7,14 +7,19 @@ locals {
     },
     {
       name       = "powershell_core_server_2012"
-      version    = "0.0.3"
+      version    = "0.0.4"
       parameters = []
     },
     {
       name       = "aws_cli"
       version    = "0.0.4"
       parameters = []
     },
+    {
+      name       = "git_windows"
+      version    = "0.0.2"
+      parameters = []
+    }
   ]
 
   component_template_args = {}

diff --git a/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars b/commonimages/base/windows_2012_r2_SQL_2014/terraform.tfvars
@@ -4,7 +4,7 @@
 
 region                = "eu-west-2"
 ami_base_name         = "windows_server_2012_r2_SQL_2014_enterprise"
-configuration_version = "0.0.8"
+configuration_version = "0.1.0"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "Windows Server 2012 R2 with SQL 2014 Enterprise"
 

diff --git a/commonimages/components/templates/git_windows.yml b/commonimages/components/templates/git_windows.yml
@@ -0,0 +1,22 @@
+---
+name: git_windows
+description: Component to install Git for Windows
+schemaVersion: 1.0
+parameters:
+  - Version:
+      type: string
+      default: 0.0.2
+      description: Component version (update this each time the file changes)
+  - Platform:
+      type: string
+      default: "Windows"
+      description: Platform.
+phases:
+  - name: build
+    steps:
+      - name: InstallGitForWindows
+        action: ExecutePowerShell
+        inputs:
+          commands:
+            - |
+              choco install git.install -y
diff --git a/commonimages/components/templates/powershell_core_server_2012.yml b/commonimages/components/templates/powershell_core_server_2012.yml
@@ -5,7 +5,7 @@ schemaVersion: 1.0
 parameters:
   - Version:
       type: string
-      default: 0.0.3
+      default: 0.4.0
       description: Component version (update this each time the file changes)
   - Platform:
       type: string
@@ -25,4 +25,4 @@ phases:
             - |
               choco install -y chocolatey-core.extension
               choco install -y kb3118401
-              choco install -y powershell-core --version '{{ PowerShellCoreVersion }}' --install-arguments='"ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1 USE_MU=0 ENABLE_MU=0 ADD_PATH=1 DISABLE_TELEMETRY"'
+              choco install -y powershell-core --version '{{ PowerShellCoreVersion }}' --install-arguments='"ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1"'
diff --git a/teams/hmpps/windows_server_2022/locals.tf b/teams/hmpps/windows_server_2022/locals.tf
@@ -14,6 +14,11 @@ locals {
       name       = "psreadline_fix"
       version    = "0.0.4"
       parameters = []
+    },
+    {
+      name       = "git_windows"
+      version    = "0.0.2"
+      parameters = []
     }
   ]
 

diff --git a/teams/hmpps/windows_server_2022/terraform.tfvars b/teams/hmpps/windows_server_2022/terraform.tfvars
@@ -5,7 +5,7 @@
 region                = "eu-west-2"
 ami_name_prefix       = "hmpps"
 ami_base_name         = "windows_server_2022"
-configuration_version = "0.1.8"
+configuration_version = "0.2.0"
 release_or_patch      = "release" # or "patch", see nomis AMI image building strategy doc
 description           = "windows server 2022"