Update Windows Dockerfiles to use nanoserver (#1102)

aws · Mar 25, 2024 · 4bda88a · 4bda88a
1 parent fe2279b
commit 4bda88a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/localbin/Dockerfile.Windows b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/localbin/Dockerfile.Windows
@@ -12,8 +12,8 @@ ARG CONTAINER_CLOUDWATCHAGENT_PATH
 ARG CONTAINER_CLOUDWATCHAGENT_DATA_PATH
 ARG TARGETARCH
 
-RUN Powershell -Command New-Item -ItemType Directory -Path $Env:CONTAINER_CLOUDWATCHAGENT_PATH -Force
-RUN Powershell -Command New-Item -ItemType Directory -Path $Env:CONTAINER_CLOUDWATCHAGENT_DATA_PATH -Force
+RUN mkdir %CONTAINER_CLOUDWATCHAGENT_PATH%
+RUN mkdir %CONTAINER_CLOUDWATCHAGENT_DATA_PATH%
 WORKDIR $CONTAINER_CLOUDWATCHAGENT_PATH
 
 COPY "./tmp/windows_${TARGETARCH}" $CONTAINER_CLOUDWATCHAGENT_PATH

diff --git a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/localmsi/Dockerfile.Windows b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/localmsi/Dockerfile.Windows
@@ -5,16 +5,28 @@ ARG IMAGE_TAG=ltsc2022
 ARG BUILD_IMAGE=mcr.microsoft.com/windows/servercore:$IMAGE_TAG
 ARG TARGETARCH=amd64
 ARG CONTAINER_CLOUDWATCHAGENT_PATH=C:\\Program\ Files\\Amazon\\AmazonCloudWatchAgent\\
+ARG CONTAINER_CLOUDWATCHAGENT_DATA_PATH=C:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\
 
-FROM $BUILD_IMAGE
+FROM $BUILD_IMAGE as builder
 
 ARG TARGETARCH
 ARG CONTAINER_CLOUDWATCHAGENT_PATH
 
 COPY ${TARGETARCH}/amazon-cloudwatch-agent.msi C:\\tmp\\amazon-cloudwatch-agent.msi
 RUN msiexec /i C:\\tmp\\amazon-cloudwatch-agent.msi
 
+# Build target CW agent container image for Windows
+FROM mcr.microsoft.com/windows/nanoserver:$IMAGE_TAG
+
+ARG CONTAINER_CLOUDWATCHAGENT_PATH
+ARG CONTAINER_CLOUDWATCHAGENT_DATA_PATH
+ARG TARGETARCH
+
+RUN mkdir %CONTAINER_CLOUDWATCHAGENT_PATH%
 WORKDIR $CONTAINER_CLOUDWATCHAGENT_PATH
 
+COPY --from=builder $CONTAINER_CLOUDWATCHAGENT_PATH $CONTAINER_CLOUDWATCHAGENT_PATH
+COPY --from=builder $CONTAINER_CLOUDWATCHAGENT_PATH $CONTAINER_CLOUDWATCHAGENT_DATA_PATH
+
 ENV RUN_IN_CONTAINER="True"
 CMD ["start-amazon-cloudwatch-agent.exe"]
diff --git a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile.Windows b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile.Windows
@@ -31,12 +31,12 @@ RUN choco install make
 RUN make build-for-docker-windows-${env:TARGETARCH}
 
 # Build target CW agent container image for Windows
-FROM mcr.microsoft.com/windows/servercore:$TAG
+FROM mcr.microsoft.com/windows/nanoserver:$TAG
 
 ARG CONTAINER_CLOUDWATCHAGENT_PATH
 ARG TARGETARCH
 
-RUN Powershell -Command New-Item -ItemType Directory -Path $env:CONTAINER_CLOUDWATCHAGENT_PATH -Force
+RUN mkdir %CONTAINER_CLOUDWATCHAGENT_PATH%
 WORKDIR $CONTAINER_CLOUDWATCHAGENT_PATH
 
 COPY --from=builder C:\\go\\src\\github.com\\aws\\amazon-cloudwatch-agent\\build\\bin\\windows_$TARGETARCH\\ $CONTAINER_CLOUDWATCHAGENT_PATH