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

AMLII-2210 enable Java FIPS provider on Windows FIPS images #32026

Merged
merged 3 commits into from
Dec 12, 2024
Merged

AMLII-2210 enable Java FIPS provider on Windows FIPS images #32026

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce4749c
AMLII-2210 enable FIPS provider on Windows FIPS images
vickenty Dec 10, 2024
9bd6e26
Quote path and quotes
vickenty Dec 10, 2024
b888bd6
Use WITH_FIPS to set JAVA_TOOL_OPTIONS
vickenty Dec 12, 2024
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
4 changes: 2 additions & 2 deletions .gitlab/container_build/docker_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@
["windows_msi_and_bosh_zip_x64-a7-fips", "build_windows_container_entrypoint"]
variables:
AGENT_ZIP: "datadog-fips-agent-7*-x86_64.zip"
BUILD_ARG: "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-${VARIANT} --build-arg WITH_JMX=${WITH_JMX} --build-arg WITH_FIPS=true --build-arg VARIANT=${VARIANT} --build-arg INSTALL_INFO=nano-${VARIANT}-fips"
BUILD_ARG: "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:lts-nanoserver-${VARIANT} --build-arg WITH_JMX=${WITH_JMX} --build-arg WITH_FIPS=true --build-arg=WITH_JMX_FIPS=${WITH_JMX_FIPS} --build-arg VARIANT=${VARIANT} --build-arg INSTALL_INFO=nano-${VARIANT}-fips"

.docker_build_fips_agent7_windows_servercore_common:
extends:
- .docker_build_fips_agent7_windows_common
variables:
BUILD_ARG: "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-${VARIANT} --build-arg WITH_JMX=${WITH_JMX} --build-arg WITH_FIPS=true --build-arg VARIANT=${VARIANT} --build-arg INSTALL_INFO=core-${VARIANT}-fips"
BUILD_ARG: "--build-arg BASE_IMAGE=mcr.microsoft.com/powershell:windowsservercore-${VARIANT} --build-arg WITH_JMX=${WITH_JMX} --build-arg WITH_FIPS=true --build-arg WITH_JMX_FIPS=${WITH_JMX_FIPS} --build-arg VARIANT=${VARIANT} --build-arg INSTALL_INFO=core-${VARIANT}-fips"
SERVERCORE: "-servercore"

include:
Expand Down
1 change: 1 addition & 0 deletions .gitlab/container_build/docker_windows_agent7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@ docker_build_fips_agent7_windows2022_core_jmx:
VARIANT: ltsc2022
TAG_SUFFIX: -7-fips-jmx
WITH_JMX: "true"
WITH_JMX_FIPS: "true"
2 changes: 2 additions & 0 deletions Dockerfiles/agent/windows/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ARG VARIANT="unknown"
ARG INSTALL_INFO="unknown"
ARG GENERAL_ARTIFACTS_CACHE_BUCKET_URL
ARG WITH_FIPS="false"
ARG WITH_JMX_FIPS

LABEL maintainer "Datadog <[email protected]>"

Expand All @@ -23,6 +24,7 @@ RUN . ./install.ps1
COPY bouncycastle-fips /fips-build
COPY install-fips.ps1 ./
RUN . ./install-fips.ps1
ENV JAVA_TOOL_OPTIONS="${WITH_JMX_FIPS:+--module-path=\'c:\\program files\\datadog\\bouncycastle fips\' -Djava.security.properties==\'c:\\program files\\datadog\\bouncycastle fips\\java.security\' -Dpolicy.url.2=\'file:c:\\program files\\datadog\\bouncycastle fips\\bc-fips.policy\'}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could we use the WITH_FIPS arg instead of making another one?


EXPOSE 8125/udp 8126/tcp

Expand Down
Loading