Skip to content

Commit

Permalink
Conditionally set GOFIPS env var (#31781)
Browse files Browse the repository at this point in the history
Co-authored-by: dustmop <[email protected]>
  • Loading branch information
hush-hush and dustmop authored Dec 5, 2024
1 parent c7e4ad6 commit 37af982
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Dockerfiles/agent/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,8 @@ RUN [ "$(getent passwd dd-agent | cut -d: -f 3)" -eq 100 ]
# Enable FIPS if needed
RUN if [ -x /opt/datadog-agent/embedded/bin/fipsinstall.sh ]; then \
/opt/datadog-agent/embedded/bin/fipsinstall.sh; \
export GOFIPS=1; \
fi
# This is used by MSGO to enable FIPS mode so it won't affect the non-FIPS image
ENV GOFIPS=1

# Override the exit script by ours to fix --pid=host operations
RUN mv /etc/s6/init/init-stage3 /etc/s6/init/init-stage3-original
Expand Down

0 comments on commit 37af982

Please sign in to comment.