Skip to content
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

Change Windows Containers to Windows Server Nano #5488

Merged
merged 4 commits into from
May 12, 2020
Merged

Change Windows Containers to Windows Server Nano #5488

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3279ef5
Change Windows Containers to Windows Server Nano
albertvaka May 11, 2020
42f0ab6
Apply suggestions from code review
albertvaka May 12, 2020
de8bdbe
Apply suggestions from code review
albertvaka May 12, 2020
e5360bb
Add release note
albertvaka May 12, 2020
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
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2489,7 +2489,7 @@ docker_build_agent7_windows1809:
IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent/agent
BUILD_CONTEXT: Dockerfiles/agent
TAG_SUFFIX: -7
BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-1809 --build-arg WITH_JMX=false
BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-1809 --build-arg WITH_JMX=false
albertvaka marked this conversation as resolved.
Show resolved Hide resolved
script:
- $ErrorActionPreference = "Stop"
- $SHORT_CI_COMMIT_SHA = ${CI_COMMIT_SHA}.Substring(0,7)
Expand All @@ -2514,7 +2514,7 @@ docker_build_agent7_windows1809_jmx:
IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent/agent
BUILD_CONTEXT: Dockerfiles/agent
TAG_SUFFIX: -7-jmx
BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-1809 --build-arg WITH_JMX=true
BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-1809 --build-arg WITH_JMX=true
albertvaka marked this conversation as resolved.
Show resolved Hide resolved
script:
- $ErrorActionPreference = "Stop"
- $SHORT_CI_COMMIT_SHA = ${CI_COMMIT_SHA}.Substring(0,7)
Expand All @@ -2540,7 +2540,7 @@ docker_build_agent7_windows1909:
IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent/agent
BUILD_CONTEXT: Dockerfiles/agent
TAG_SUFFIX: -7
BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-1909 --build-arg WITH_JMX=false
BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:nanoserver-1909 --build-arg WITH_JMX=false
script:
- $ErrorActionPreference = "Stop"
- $SHORT_CI_COMMIT_SHA = ${CI_COMMIT_SHA}.Substring(0,7)
Expand All @@ -2565,7 +2565,7 @@ docker_build_agent7_windows1909_jmx:
IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/datadog-agent/agent
BUILD_CONTEXT: Dockerfiles/agent
TAG_SUFFIX: -7-jmx
BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-1909 --build-arg WITH_JMX=true
BUILD_ARG: --build-arg BASE_IMAGE=mcr.microsoft.com/powershell:nanoserver-1909 --build-arg WITH_JMX=true
script:
- $ErrorActionPreference = "Stop"
- $SHORT_CI_COMMIT_SHA = ${CI_COMMIT_SHA}.Substring(0,7)
Expand Down