Skip to content

Commit 901ebc2

Browse files
breskebybreskeby
authored
[8.19] Rename docker fips image to cloud-ess-fips (#127561) (#127568)
* Rename docker fips image to cloud-ess-fips (#127561) (cherry picked from commit aa30951) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java # distribution/docker/src/docker/Dockerfile * Fix typo
1 parent 655e3ce commit 901ebc2

File tree

6 files changed

+25
-20
lines changed

6 files changed

+25
-20
lines changed

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,21 @@ public enum DockerBase {
2424
// Chainguard based wolfi image with latest jdk
2525
// This is usually updated via renovatebot
2626
// spotless:off
27-
WOLFI("docker.elastic.co/wolfi/chainguard-base:latest@sha256:1c7f5aa0e7997455b8500d095c7a90e617102d3941eb0757ac62cfea509e09b9",
27+
WOLFI(
28+
"docker.elastic.co/wolfi/chainguard-base:latest@sha256:1c7f5aa0e7997455b8500d095c7a90e617102d3941eb0757ac62cfea509e09b9",
2829
"-wolfi",
2930
"apk"
3031
),
31-
FIPS("docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7", "-fips", "apk"),
3232
// spotless:on
3333

3434
// Based on WOLFI above, with more extras. We don't set a base image because
3535
// we programmatically extend from the wolfi image.
36-
CLOUD_ESS(null, "-cloud-ess", "apk");
36+
CLOUD_ESS(null, "-cloud-ess", "apk"),
37+
CLOUD_ESS_FIPS(
38+
"docker.elastic.co/wolfi/chainguard-base-fips:sha256-ebfc3f1d7dba992231747a2e05ad1b859843e81b5e676ad342859d7cf9e425a7",
39+
"-cloud-ess-fips",
40+
"apk"
41+
);
3742

3843
private final String image;
3944
private final String suffix;

‎distribution/docker/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ void addBuildDockerContextTask(Architecture architecture, DockerBase base) {
307307
filter TransformLog4jConfigFilter
308308
}
309309
}
310-
if(base == DockerBase.FIPS) {
310+
if(base == DockerBase.CLOUD_ESS_FIPS) {
311311

312312
// If we're performing a release build, but `build.id` hasn't been set, we can
313313
// infer that we're not at the Docker building stage of the build, and therefore
@@ -587,19 +587,19 @@ subprojects { Project subProject ->
587587
base = DockerBase.UBI
588588
} else if (subProject.name.contains('ironbank-')) {
589589
base = DockerBase.IRON_BANK
590-
} else if (subProject.name.contains('cloud-ess-')) {
590+
} else if (subProject.name.contains('cloud-ess-docker')) {
591591
base = DockerBase.CLOUD_ESS
592592
} else if (subProject.name.contains('wolfi-')) {
593593
base = DockerBase.WOLFI
594-
} else if (subProject.name.contains('fips-')) {
595-
base = DockerBase.FIPS
594+
} else if (subProject.name.contains('cloud-ess-fips-docker')) {
595+
base = DockerBase.CLOUD_ESS_FIPS
596596
}
597597

598598
final String arch = architecture == Architecture.AARCH64 ? '-aarch64' : ''
599599
final String extension = base == DockerBase.UBI ? 'ubi.tar' :
600600
(base == DockerBase.IRON_BANK ? 'ironbank.tar' :
601601
(base == DockerBase.CLOUD_ESS ? 'cloud-ess.tar' :
602-
(base == DockerBase.FIPS ? 'fips.tar' :
602+
(base == DockerBase.CLOUD_ESS_FIPS ? 'cloud-ess-fips.tar' :
603603
(base == DockerBase.WOLFI ? 'wolfi.tar' :
604604
'docker.tar'))))
605605
final String artifactName = "elasticsearch${arch}${base.suffix}_test"

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

File renamed without changes.

‎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

+10-10
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ RUN chmod 0555 /bin/tini
4343
# Install required packages to extract the Elasticsearch distribution
4444
<% if (docker_base == 'default') { %>
4545
RUN <%= retry.loop(package_manager, "${package_manager} update && DEBIAN_FRONTEND=noninteractive ${package_manager} install -y curl ") %>
46-
<% } else if (docker_base == "wolfi" || docker_base == "fips") { %>
46+
<% } else if (docker_base == "wolfi" || docker_base == 'cloud_ess_fips') { %>
4747
RUN <%= retry.loop(package_manager, "export DEBIAN_FRONTEND=noninteractive && ${package_manager} update && ${package_manager} update && ${package_manager} add --no-cache curl") %>
4848
<% } else { %>
4949
RUN <%= retry.loop(package_manager, "${package_manager} install -y findutils tar gzip") %>
5050
<% } %>
5151
52-
<% if (docker_base != 'wolfi' && docker_base != 'fips' ) { %>
52+
<% if (docker_base != 'wolfi' && docker_base != 'cloud_ess_fips' ) { %>
5353
# `tini` is a tiny but valid init for containers. This is used to cleanly
5454
# control how ES and any child processes are shut down.
5555
# For wolfi we pick it from the blessed wolfi package registry.
@@ -117,7 +117,7 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
117117
chmod 0775 bin config config/jvm.options.d data logs plugins && \\
118118
find config -type f -exec chmod 0664 {} +
119119

120-
<% if (docker_base == "fips") { %>
120+
<% if (docker_base == 'cloud_ess_fips') { %>
121121
# Add plugins infrastructure
122122
RUN mkdir -p /opt/plugins/archive
123123
RUN chmod -R 0555 /opt/plugins
@@ -178,7 +178,7 @@ RUN ${package_manager} update --setopt=tsflags=nodocs -y && \\
178178
nc shadow-utils zip findutils unzip procps-ng && \\
179179
${package_manager} clean all
180180
181-
<% } else if (docker_base == "wolfi" || docker_base == "fips") { %>
181+
<% } else if (docker_base == "wolfi" || docker_base == 'cloud_ess_fips') { %>
182182
RUN <%= retry.loop(package_manager,
183183
"export DEBIAN_FRONTEND=noninteractive && \n" +
184184
" ${package_manager} update && \n" +
@@ -227,7 +227,7 @@ RUN groupadd -g 1000 elasticsearch && \\
227227
adduser --uid 1000 --gid 1000 --home /usr/share/elasticsearch elasticsearch && \\
228228
adduser elasticsearch root && \\
229229
chown -R 0:0 /usr/share/elasticsearch
230-
<% } else if (docker_base == "wolfi" || docker_base == "fips") { %>
230+
<% } else if (docker_base == "wolfi" || docker_base == 'cloud_ess_fips') { %>
231231
RUN groupadd -g 1000 elasticsearch && \
232232
adduser -G elasticsearch -u 1000 elasticsearch -D --home /usr/share/elasticsearch elasticsearch && \
233233
adduser elasticsearch root && \
@@ -243,7 +243,7 @@ ENV ELASTIC_CONTAINER true
243243
WORKDIR /usr/share/elasticsearch
244244
245245
COPY --from=builder --chown=0:0 /usr/share/elasticsearch /usr/share/elasticsearch
246-
<% if (docker_base != "wolfi" && docker_base != "fips") { %>
246+
<% if (docker_base != "wolfi" && docker_base != 'cloud_ess_fips') { %>
247247
COPY --from=builder --chown=0:0 /bin/tini /bin/tini
248248
<% } %>
249249
@@ -277,7 +277,7 @@ RUN chmod g=u /etc/passwd && \\
277277
# stays up-to-date with changes to Ubuntu's store)
278278
COPY bin/docker-openjdk /etc/ca-certificates/update.d/docker-openjdk
279279
RUN /etc/ca-certificates/update.d/docker-openjdk
280-
<% } else if (docker_base == 'wolfi' || docker_base == "fips") { %>
280+
<% } else if (docker_base == 'wolfi' || docker_base == 'cloud_ess_fips') { %>
281281
RUN ln -sf /etc/ssl/certs/java/cacerts /usr/share/elasticsearch/jdk/lib/security/cacerts
282282
<% } else { %>
283283
RUN ln -sf /etc/pki/ca-trust/extracted/java/cacerts /usr/share/elasticsearch/jdk/lib/security/cacerts
@@ -324,7 +324,7 @@ RUN mkdir /licenses && cp LICENSE.txt /licenses/LICENSE
324324
COPY LICENSE /licenses/LICENSE.addendum
325325
<% } %>
326326

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

347-
<% if (docker_base == 'fips') { %>
347+
<% if (docker_base == 'cloud_ess_fips') { %>
348348
COPY --from=builder --chown=0:0 /opt /opt
349349
ENV ES_PLUGIN_ARCHIVE_DIR /opt/plugins/archive
350350
WORKDIR /usr/share/elasticsearch
351351
COPY --from=builder --chown=0:0 /fips/libs/*.jar /usr/share/elasticsearch/lib/
352352
<% } %>
353353
################################################################################
354354
# End of multi-stage Dockerfile
355-
################################################################################
355+
################################################################################

‎settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ List projects = [
7272
'distribution:docker:ubi-docker-export',
7373
'distribution:docker:wolfi-docker-aarch64-export',
7474
'distribution:docker:wolfi-docker-export',
75-
'distribution:docker:fips-docker-export',
76-
'distribution:docker:fips-docker-aarch64-export',
75+
'distribution:docker:cloud-ess-fips-docker-export',
76+
'distribution:docker:cloud-ess-fips-docker-aarch64-export',
7777
'distribution:packages:aarch64-deb',
7878
'distribution:packages:deb',
7979
'distribution:packages:aarch64-rpm',

0 commit comments

Comments
 (0)