Skip to content

Update to Windows 2022 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Update to Windows 2022 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e89c22d
Update to Windows 2022
marvinbuss Feb 28, 2024
4d7ddd8
Merge branch 'main' into marvinbuss/windows_2022
marvinbuss Feb 28, 2024
d651b2f
Merge branch 'main' into marvinbuss/windows_2022
marvinbuss Mar 13, 2025
e97229c
Update container IR version
marvinbuss Mar 13, 2025
680864f
Update image
marvinbuss Mar 13, 2025
d27d89a
Add trigger to workflow
marvinbuss Mar 13, 2025
94e8a8f
Bump azure/azapi from 2.2.0 to 2.3.0
marvinbuss Mar 13, 2025
8d7bdaf
Bump hashicorp/azurerm from 4.21.1 to 4.22.0
marvinbuss Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/_containerTemplate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ on:
jobs:
deployment:
name: Container Build & Push
runs-on: [windows-2019]
runs-on: [windows-2022]
continue-on-error: false
environment: ${{ inputs.environment }}

Expand All @@ -56,7 +56,7 @@ jobs:
- name: Login Container Registry
id: registry_login
uses: docker/login-action@v3.3.0
if: github.event_name != 'pull_request'
# if: github.event_name != 'pull_request'
with:
registry: ${{ inputs.registry_uri }}
username: ${{ secrets.USER_NAME }}
Expand Down Expand Up @@ -87,6 +87,6 @@ jobs:
--build-arg="INSTALL_JDK=true" `
--tag ${{ steps.metadata.outputs.tags }} .

if( "${{ github.event_name != 'pull_request' }}" -eq "true" ) {
if( "${{ github.event_name == 'pull_request' }}" -eq "true" ) {
docker push ${{ steps.metadata.outputs.tags }}
}
2 changes: 2 additions & 0 deletions .github/workflows/terraform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
paths:
- "**.tf"
- "code/infra/**"
- "config/**"
- ".github/workflows/terraform.yml"

pull_request:
Expand All @@ -14,6 +15,7 @@ on:
paths:
- "**.tf"
- "code/infra/**"
- "config/**"
- ".github/workflows/terraform.yml"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion code/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/windows/servercore:ltsc2019
FROM mcr.microsoft.com/windows/servercore:ltsc2022
ARG INSTALL_JDK=false

# Download the latest self-hosted integration runtime installer into the SHIR folder
Expand Down
2 changes: 1 addition & 1 deletion code/container/SHIR/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function Install-SHIR() {

# Temporarily disable progress updates to speed up the download process. (See https://stackoverflow.com/questions/69942663/invoke-webrequest-progress-becomes-irresponsive-paused-while-downloading-the-fil)
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri 'https://go.microsoft.com/fwlink/?linkid=839822&clcid=0x409' -OutFile "C:\SHIR\$MsiFileName"
Invoke-WebRequest -Uri 'https://download.microsoft.com/download/e/4/7/e4771905-1079-445b-8bf9-8a1a075d8a10/IntegrationRuntime_5.50.9162.1.msi' -OutFile "C:\SHIR\$MsiFileName"
$ProgressPreference = 'Continue'
}

Expand Down
4 changes: 2 additions & 2 deletions code/infra/terraform.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "4.21.1"
version = "4.22.0"
}
azapi = {
source = "azure/azapi"
version = "2.2.0"
version = "2.3.0"
}
time = {
source = "hashicorp/time"
Expand Down
2 changes: 1 addition & 1 deletion config/PerfectThymeTech/vars.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ log_analytics_workspace_id = "/subscriptions/e82c5267-9dc4-4f45-ac13-abdd5e130d2
# SHIR variables

# Container variables
container_image_reference = "ghcr.io/perfectthymetech/shiragentazure:main"
container_image_reference = "ghcr.io/perfectthymetech/shiragentazure:pr-6"

# Network variables
vnet_id = "/subscriptions/1fdab118-1638-419a-8b12-06c9543714a0/resourceGroups/ptt-dev-networking-rg/providers/Microsoft.Network/virtualNetworks/spoke-ptt-dev-vnet001"
Expand Down