From 16d51ca003f131d9c1d4cd32d8385d41adcb1f7e Mon Sep 17 00:00:00 2001 From: AndreyKoltsov1997 Date: Thu, 18 Jul 2024 14:04:28 +0200 Subject: [PATCH] [TCQA] Windows 2019: execute the removal of plugins directory under PowerShell (once SHELL is enabled) --- .../MinimalAgent/nanoserver/NanoServer1809.Dockerfile | 6 +++--- .../windows/MinimalAgent/nanoserver/1809/Dockerfile | 6 +++--- .../windows/MinimalAgent/nanoserver/1903/Dockerfile | 6 +++--- .../windows/MinimalAgent/nanoserver/1909/Dockerfile | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/windows/MinimalAgent/nanoserver/NanoServer1809.Dockerfile b/configs/windows/MinimalAgent/nanoserver/NanoServer1809.Dockerfile index 5c916c65..2538f64c 100644 --- a/configs/windows/MinimalAgent/nanoserver/NanoServer1809.Dockerfile +++ b/configs/windows/MinimalAgent/nanoserver/NanoServer1809.Dockerfile @@ -29,13 +29,13 @@ USER ContainerAdministrator RUN mkdir C:\\BuildAgent COPY TeamCity/buildAgent C:/BuildAgent +COPY scripts/*.cs /scripts/ +SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + # Workaround for TW-87124 - Windows-based plugin directories receive incorrect case, causing their inability ... # ... to load. The directory will be fetched from the server upon the first update with proper case. RUN Remove-Item -Recurse -Force C:/BuildAgent/plugins -COPY scripts/*.cs /scripts/ -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - COPY run-agent.ps1 /BuildAgent/run-agent.ps1 # JDK diff --git a/context/generated/windows/MinimalAgent/nanoserver/1809/Dockerfile b/context/generated/windows/MinimalAgent/nanoserver/1809/Dockerfile index f01f44db..b4a65c35 100644 --- a/context/generated/windows/MinimalAgent/nanoserver/1809/Dockerfile +++ b/context/generated/windows/MinimalAgent/nanoserver/1809/Dockerfile @@ -23,13 +23,13 @@ USER ContainerAdministrator RUN mkdir C:\\BuildAgent COPY TeamCity/buildAgent C:/BuildAgent +COPY scripts/*.cs /scripts/ +SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + # Workaround for TW-87124 - Windows-based plugin directories receive incorrect case, causing their inability ... # ... to load. The directory will be fetched from the server upon the first update with proper case. RUN Remove-Item -Recurse -Force C:/BuildAgent/plugins -COPY scripts/*.cs /scripts/ -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - COPY run-agent.ps1 /BuildAgent/run-agent.ps1 # JDK diff --git a/context/generated/windows/MinimalAgent/nanoserver/1903/Dockerfile b/context/generated/windows/MinimalAgent/nanoserver/1903/Dockerfile index acdfdc65..9676c640 100644 --- a/context/generated/windows/MinimalAgent/nanoserver/1903/Dockerfile +++ b/context/generated/windows/MinimalAgent/nanoserver/1903/Dockerfile @@ -23,13 +23,13 @@ USER ContainerAdministrator RUN mkdir C:\\BuildAgent COPY TeamCity/buildAgent C:/BuildAgent +COPY scripts/*.cs /scripts/ +SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + # Workaround for TW-87124 - Windows-based plugin directories receive incorrect case, causing their inability ... # ... to load. The directory will be fetched from the server upon the first update with proper case. RUN Remove-Item -Recurse -Force C:/BuildAgent/plugins -COPY scripts/*.cs /scripts/ -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - COPY run-agent.ps1 /BuildAgent/run-agent.ps1 # JDK diff --git a/context/generated/windows/MinimalAgent/nanoserver/1909/Dockerfile b/context/generated/windows/MinimalAgent/nanoserver/1909/Dockerfile index 5e35b6bc..81d4f4b6 100644 --- a/context/generated/windows/MinimalAgent/nanoserver/1909/Dockerfile +++ b/context/generated/windows/MinimalAgent/nanoserver/1909/Dockerfile @@ -23,13 +23,13 @@ USER ContainerAdministrator RUN mkdir C:\\BuildAgent COPY TeamCity/buildAgent C:/BuildAgent +COPY scripts/*.cs /scripts/ +SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] + # Workaround for TW-87124 - Windows-based plugin directories receive incorrect case, causing their inability ... # ... to load. The directory will be fetched from the server upon the first update with proper case. RUN Remove-Item -Recurse -Force C:/BuildAgent/plugins -COPY scripts/*.cs /scripts/ -SHELL ["pwsh", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - COPY run-agent.ps1 /BuildAgent/run-agent.ps1 # JDK