Skip to content

Commit b2027af

Browse files
breskebybreskeby
authored
[9.0] Rename docker fips image to cloud-ess-fips (elastic#127561) (elastic#128173)
* Rename docker fips image to cloud-ess-fips (elastic#127561) (cherry picked from commit aa30951) # Conflicts: # distribution/docker/cloud-ess-fips-docker-aarch64-export/build.gradle # distribution/docker/fips-docker-aarch64-export/build.gradle # server/src/main/java/org/elasticsearch/common/util/Countable.java # settings.gradle * Fix backport merge
1 parent 8642180 commit b2027af

File tree

6 files changed

+35
-25
lines changed

6 files changed

+35
-25
lines changed

‎build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,17 @@ public enum DockerBase {
2828
"apk",
2929
"Dockerfile"
3030
),
31-
FIPS(
32-
"docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7@sha256:ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7",
33-
"-fips",
34-
"apk",
35-
"Dockerfile"
36-
),
3731
// spotless:on
3832
// Based on WOLFI above, with more extras. We don't set a base image because
3933
// we programmatically extend from the wolfi image.
40-
CLOUD_ESS(null, "-cloud-ess", "apk", "Dockerfile.cloud-ess"),;
34+
CLOUD_ESS(null, "-cloud-ess", "apk", "Dockerfile.cloud-ess"),
35+
36+
CLOUD_ESS_FIPS(
37+
"docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7@sha256:ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7",
38+
"-cloud-ess-fips",
39+
"apk",
40+
"Dockerfile"
41+
);
4142

4243
private final String image;
4344
private final String suffix;

‎distribution/docker/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base, Strin
299299
filter TransformLog4jConfigFilter
300300
}
301301
}
302-
if(base == DockerBase.FIPS) {
302+
if(base == DockerBase.CLOUD_ESS_FIPS) {
303303

304304
// If we're performing a release build, but `build.id` hasn't been set, we can
305305
// infer that we're not at the Docker building stage of the build, and therefore
@@ -593,19 +593,19 @@ subprojects { Project subProject ->
593593
DockerBase base = DockerBase.DEFAULT
594594
if (subProject.name.contains('ironbank-')) {
595595
base = DockerBase.IRON_BANK
596-
} else if (subProject.name.contains('cloud-ess-')) {
596+
} else if (subProject.name.contains('cloud-ess-docker')) {
597597
base = DockerBase.CLOUD_ESS
598598
} else if (subProject.name.contains('wolfi-')) {
599599
base = DockerBase.WOLFI
600-
} else if (subProject.name.contains('fips-')) {
601-
base = DockerBase.FIPS
600+
} else if (subProject.name.contains('cloud-ess-fips-docker')) {
601+
base = DockerBase.CLOUD_ESS_FIPS
602602
}
603603

604604
final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
605605
final String extension =
606606
(base == DockerBase.IRON_BANK ? 'ironbank.tar' :
607607
(base == DockerBase.CLOUD_ESS ? 'cloud-ess.tar' :
608-
(base == DockerBase.FIPS ? 'fips.tar' :
608+
(base == DockerBase.CLOUD_ESS_FIPS ? 'cloud-ess-fips.tar' :
609609
(base == DockerBase.WOLFI ? 'wolfi.tar' :
610610
'docker.tar'))))
611611
final String artifactName = "elasticsearch${arch}${base.suffix}_test"

‎distribution/docker/cloud-ess-fips-docker-aarch64-export/build.gradle‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/

distribution/docker/fips-docker-export/build.gradle renamed to distribution/docker/cloud-ess-fips-docker-export/build.gradle

File renamed without changes.

‎distribution/docker/src/docker/Dockerfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN chmod 0555 /bin/tini
4141
<% } else { %>
4242
4343
# Install required packages to extract the Elasticsearch distribution
44-
<% if (docker_base == "wolfi" || docker_base == "fips") { %>
44+
<% if (docker_base == "wolfi" || docker_base == "cloud_ess_fips") { %>
4545
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
4646
<% } else { %>
4747
RUN <%= retry.loop(package_manager, "${package_manager} install -y findutils tar gzip") %>
@@ -115,7 +115,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
115115
chmod 0775 bin config config/jvm.options.d data logs plugins && \\
116116
find config -type f -exec chmod 0664 {} +
117117

118-
<% if (docker_base == "fips") { %>
118+
<% if (docker_base == "cloud_ess_fips") { %>
119119

120120
# Add plugins infrastructure
121121
RUN mkdir -p /opt/plugins/archive
@@ -179,7 +179,7 @@ RUN ${package_manager} update --setopt=tsflags=nodocs -y && \\
179179
nc shadow-utils zip findutils unzip procps-ng && \\
180180
${package_manager} clean all
181181
182-
<% } else if (docker_base == "wolfi" || docker_base == "fips") { %>
182+
<% } else if (docker_base == "wolfi" || docker_base == "cloud_ess_fips") { %>
183183
RUN <%= retry.loop(package_manager,
184184
"export DEBIAN_FRONTEND=noninteractive && \n" +
185185
" ${package_manager} update && \n" +
@@ -208,7 +208,7 @@ RUN <%= retry.loop(
208208
<% } %>
209209
210210
211-
<% if (docker_base == "wolfi" || docker_base == "fips") { %>
211+
<% if (docker_base == "wolfi" || docker_base == "cloud_ess_fips") { %>
212212
RUN groupadd -g 1000 elasticsearch && \
213213
adduser -G elasticsearch -u 1000 elasticsearch -D --home /usr/share/elasticsearch elasticsearch && \
214214
adduser elasticsearch root && \
@@ -219,17 +219,17 @@ RUN groupadd -g 1000 elasticsearch && \\
219219
chown -R 0:0 /usr/share/elasticsearch
220220
<% } %>
221221
222-
ENV ELASTIC_CONTAINER true
222+
ENV ELASTIC_CONTAINER=true
223223
224224
WORKDIR /usr/share/elasticsearch
225225
226226
COPY --from=builder --chown=0:0 /usr/share/elasticsearch /usr/share/elasticsearch
227-
<% if (docker_base != "wolfi" && docker_base != "fips") { %>
227+
<% if (docker_base != "wolfi" && docker_base != "cloud_ess_fips") { %>
228228
COPY --from=builder --chown=0:0 /bin/tini /bin/tini
229229
<% } %>
230230
231-
ENV PATH /usr/share/elasticsearch/bin:\$PATH
232-
ENV SHELL /bin/bash
231+
ENV PATH=/usr/share/elasticsearch/bin:\$PATH
232+
ENV SHELL=/bin/bash
233233
COPY ${bin_dir}/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
234234
235235
# 1. Sync the user and group permissions of /etc/passwd
@@ -249,7 +249,7 @@ RUN chmod g=u /etc/passwd && \\
249249
chmod 0775 /usr/share/elasticsearch && \\
250250
chown elasticsearch bin config config/jvm.options.d data logs plugins
251251

252-
<% if (docker_base == 'wolfi' || docker_base == "fips") { %>
252+
<% if (docker_base == 'wolfi' || docker_base == "cloud_ess_fips") { %>
253253
RUN ln -sf /etc/ssl/certs/java/cacerts /usr/share/elasticsearch/jdk/lib/security/cacerts
254254
<% } else { %>
255255
RUN ln -sf /etc/pki/ca-trust/extracted/java/cacerts /usr/share/elasticsearch/jdk/lib/security/cacerts
@@ -292,7 +292,7 @@ RUN mkdir /licenses && ln LICENSE.txt /licenses/LICENSE
292292
COPY LICENSE /licenses/LICENSE.addendum
293293
<% } %>
294294

295-
<% if (docker_base == "wolfi" || docker_base == "fips") { %>
295+
<% if (docker_base == "wolfi" || docker_base == "cloud_ess_fips") { %>
296296
# Our actual entrypoint is `tini`, a minimal but functional init program. It
297297
# calls the entrypoint we provide, while correctly forwarding signals.
298298
ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/docker-entrypoint.sh"]
@@ -312,9 +312,9 @@ USER 1000:0
312312
HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD curl -I -f --max-time 5 http://localhost:9200 || exit 1
313313
<% } %>
314314

315-
<% if (docker_base == 'fips') { %>
315+
<% if (docker_base == 'cloud_ess_fips') { %>
316316
COPY --from=builder --chown=0:0 /opt /opt
317-
ENV ES_PLUGIN_ARCHIVE_DIR /opt/plugins/archive
317+
ENV ES_PLUGIN_ARCHIVE_DIR=/opt/plugins/archive
318318
WORKDIR /usr/share/elasticsearch
319319
COPY --from=builder --chown=0:0 /fips/libs/*.jar /usr/share/elasticsearch/lib/
320320
<% } %>

‎settings.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ List projects = [
7070
'distribution:docker:ironbank-docker-export',
7171
'distribution:docker:wolfi-docker-aarch64-export',
7272
'distribution:docker:wolfi-docker-export',
73-
'distribution:docker:fips-docker-export',
73+
'distribution:docker:cloud-ess-fips-docker-export',
74+
'distribution:docker:cloud-ess-fips-docker-aarch64-export',
7475
'distribution:packages:aarch64-deb',
7576
'distribution:packages:deb',
7677
'distribution:packages:aarch64-rpm',

0 commit comments

Comments
 (0)