@@ -118,45 +118,45 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
118118 find config -type f -exec chmod 0664 {} +
119119
120120<% if (docker_base == "fips" ) { %>
121- # Add plugins infrastructure
122- RUN mkdir -p /opt/plugins/archive
123- RUN chmod -R 0555 /opt/plugins
124-
125- RUN mkdir -p /fips/libs
126- COPY fips/libs/*.jar /fips/libs/
127-
128- COPY filebeat-${version}.tar.gz metricbeat-${version}.tar.gz /tmp/
129- RUN set -eux ; \\
130- for beat in filebeat metricbeat ; do \\
131- if [ ! -s /tmp/\$ beat-${version}.tar.gz ]; then \\
132- echo "/tmp/\$ beat-${version}.tar.gz is empty - cannot uncompress" 2>&1 ; \\
133- exit 1 ; \\
134- fi ; \\
135- if ! tar tf /tmp/\$ beat-${version}.tar.gz >/dev/null; then \\
136- echo "/tmp/\$ beat-${version}.tar.gz is corrupt - cannot uncompress" 2>&1 ; \\
137- exit 1 ; \\
138- fi ; \\
139- mkdir -p /opt/\$ beat ; \\
140- tar xf /tmp/\$ beat-${version}.tar.gz -C /opt/\$ beat --strip-components=1 ; \\
141- done
142-
143- COPY plugins/*.zip /opt/plugins/archive/
144-
145- RUN chown 1000:1000 /opt/plugins/archive/*
146- RUN chmod 0444 /opt/plugins/archive/*
147-
148- COPY fips/resources/fips_java.security /usr/share/elasticsearch/config/fips_java.security
149- COPY fips/resources/fips_java.policy /usr/share/elasticsearch/config/fips_java.policy
150-
151- WORKDIR /usr/share/elasticsearch/config
152-
153- # # Add fips specific JVM options
154- RUN cat <<EOF > /usr/share/elasticsearch/config/jvm.options.d/fips.options
155- -Djavax.net.ssl.keyStoreType=BCFKS
156- -Dorg.bouncycastle.fips.approved_only=true
157- -Djava.security.properties=config/fips_java.security
158- -Djava.security.policy=config/fips_java.policy
159- EOF
121+ # Add plugins infrastructure
122+ RUN mkdir -p /opt/plugins/archive
123+ RUN chmod -R 0555 /opt/plugins
124+
125+ RUN mkdir -p /fips/libs
126+ COPY fips/libs/*.jar /fips/libs/
127+
128+ COPY filebeat-${version}.tar.gz metricbeat-${version}.tar.gz /tmp/
129+ RUN set -eux ; \\
130+ for beat in filebeat metricbeat ; do \\
131+ if [ ! -s /tmp/\$ beat-${version}.tar.gz ]; then \\
132+ echo "/tmp/\$ beat-${version}.tar.gz is empty - cannot uncompress" 2>&1 ; \\
133+ exit 1 ; \\
134+ fi ; \\
135+ if ! tar tf /tmp/\$ beat-${version}.tar.gz >/dev/null; then \\
136+ echo "/tmp/\$ beat-${version}.tar.gz is corrupt - cannot uncompress" 2>&1 ; \\
137+ exit 1 ; \\
138+ fi ; \\
139+ mkdir -p /opt/\$ beat ; \\
140+ tar xf /tmp/\$ beat-${version}.tar.gz -C /opt/\$ beat --strip-components=1 ; \\
141+ done
142+
143+ COPY plugins/*.zip /opt/plugins/archive/
144+
145+ RUN chown 1000:1000 /opt/plugins/archive/*
146+ RUN chmod 0444 /opt/plugins/archive/*
147+
148+ COPY fips/resources/fips_java.security /usr/share/elasticsearch/config/fips_java.security
149+ COPY fips/resources/fips_java.policy /usr/share/elasticsearch/config/fips_java.policy
150+
151+ WORKDIR /usr/share/elasticsearch/config
152+
153+ # # Add fips specific JVM options
154+ RUN cat <<EOF > /usr/share/elasticsearch/config/jvm.options.d/fips.options
155+ -Djavax.net.ssl.keyStoreType=BCFKS
156+ -Dorg.bouncycastle.fips.approved_only=true
157+ -Djava.security.properties=config/fips_java.security
158+ -Djava.security.policy=config/fips_java.policy
159+ EOF
160160<% } %>
161161
162162# ###############################################################################
0 commit comments