Skip to content

Commit bc7b74d

Browse files
mergify[bot]jsvddonoghuc
authored
[main] (backport #17875) Make sure FIPS comments belong in the platform-sre Dockerfile (#17898)
* Make sure FIPS comments belong in the platform-sre Dockerfile (#17875) * Make sure FIPS comments belong in the platform-sre Dockerfile * Update docker/templates/Dockerfile.erb Co-authored-by: Rye Biesemeyer <[email protected]> --------- Co-authored-by: Rye Biesemeyer <[email protected]> (cherry picked from commit 79fac1f) # Conflicts: # docker/templates/Dockerfile.erb * fix merge conflict --------- Co-authored-by: João Duarte <[email protected]> Co-authored-by: donoghuc <[email protected]>
1 parent b430599 commit bc7b74d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

docker/templates/Dockerfile.erb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ COPY --chown=logstash:root pipeline/default.conf /usr/share/logstash/pipeline/lo
107107
COPY --chmod=0755 bin/docker-entrypoint /usr/local/bin/
108108

109109
<% if image_flavor == 'observability-sre' -%>
110-
# Add FIPS configuration for observability-sre image flavor
110+
<%# Add FIPS configuration for observability-sre image flavor %>
111+
111112
RUN mkdir -p /usr/share/logstash/config/security
112113

113114
# Copy JVM security configuration files from the unpacked tarball

0 commit comments

Comments
 (0)