Change default container image to be based on UBI minimal instead of Ubuntu #116739

jozala · 2024-11-13T14:51:40Z

Previously default Docker image was based on Ubuntu. This changes the base image for default to be UBI minimal.

jozala · 2024-11-14T12:21:52Z

distribution/docker/src/docker/Dockerfile


-<% if (docker_base == 'ubi') { %>
 LABEL name="Elasticsearch" \\
  maintainer="infra@elastic.co" \\
  vendor="Elastic" \\


@breskeby I've tried to keep the logic unchanged, but here I have decided to change it to simplify the logic a bit.
Is it OK that wolfi Docker image will also have these labels?

jozala · 2024-11-14T16:00:31Z

distribution/docker/src/docker/Dockerfile

@@ -117,27 +115,6 @@ RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' bin/elas
    chmod 0775 bin config config/jvm.options.d data logs plugins && \\
    find config -type f -exec chmod 0664 {} +

-<% if (docker_base == "cloud") { %>


I've removed the blocks for cloud from Dockerfile template, because I believe it is no longer used. I couldn't see any code which would use that. Please let me know if I am missing something here.

thanks for cleaning that up

yes it was removed here: #115357

breskeby · 2024-11-14T18:17:20Z

distribution/docker/README.md

@@ -23,14 +22,7 @@ the [DockerBase] enum.
     software (FOSS) and Commercial off-the-shelf (COTS). In practice, this is
     another UBI build, this time on the regular UBI image, with extra
     hardening. See below for more details.
-   * Cloud - this is mostly the same as the default image, with some notable differences:


thanks for cleaning up

breskeby · 2024-11-14T18:21:53Z

qa/packaging/src/test/java/org/elasticsearch/packaging/test/DockerTests.java

 *     <li>Another UBI image for Iron Bank</li>
 *     <li>A WOLFI-based image</li>
- *     <li>Images for Cloud</li>
+ *     <li>Image for Cloud ESS</li>


its a mess. but we should just name that "Image for Cloud" sorry

breskeby · 2024-11-14T18:28:22Z

qa/packaging/src/test/java/org/elasticsearch/packaging/test/DockerTests.java

-    public void test200UbiImagesHaveLicenseDirectory() {
-        assumeTrue(distribution.packaging == Packaging.DOCKER_UBI);
+    public void test200ImagesHaveLicenseDirectory() {
+        assumeTrue(distribution.packaging != Packaging.DOCKER_IRON_BANK);


these tests haven't run before for wolfi or cloud-less right? If they now pass also for those even better

Yes. They should run for more images now. This is also the reason I've changed the Dockerfile to add license for all images.

breskeby

lgtm.

breskeby

Actually I noticed our test coverage for docker in PRs could be better here. Can you tweak our pr packaging tests to test against cloud-ess and against our default docker image?

elasticsearch/.buildkite/pipelines/pull-request/packaging-tests-unix.yml

Line 8 in f1f5ee0

command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.docker-cloud-ess

jozala · 2024-11-14T20:07:26Z

.buildkite/pipelines/pull-request/packaging-tests-unix.yml

      - label: "{{matrix.image}} / docker / packaging-tests-unix"
        key: "packaging-tests-unix-docker"
+        command: ./.ci/scripts/packaging-test.sh destructiveDistroTest.docker
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - debian-11
+              - opensuse-leap-15
+              - oraclelinux-7
+              - oraclelinux-8
+              - sles-12
+              - sles-15
+              - ubuntu-1804
+              - ubuntu-2004
+              - ubuntu-2204
+              - rocky-8
+              - rocky-9
+              - rhel-7
+              - rhel-8
+              - rhel-9
+              - almalinux-8
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          diskSizeGb: 350
+          machineType: custom-16-32768


I've added the testing for default Docker image here. Done by copying the whole step to keep the steps naming.
I was trying to do it with matrix with 2 params (similar to this), but AFAIK that would require changing names of all steps. I am not sure how much we are attached to these names.
Let me know what you think about it.

We're not attached to the names. I think using a 2 axis matrix makes the most sense vs duplicating the step.

+1 on using matrix with changed names we usually don't care about.

elasticsearchmachine · 2024-11-14T20:09:41Z

Pinging @elastic/es-delivery (Team:Delivery)

mark-vieira

LGTM. FYI, we want to also move to UBI9, but that can be done in a follow up.

Previously default Docker image was based on Ubuntu. This changes the base image for default to be UBI minimal.

Removed switch expression from Gradle as it is not supported in this version of Groovy

…Ubuntu (elastic#116739) Previously default Docker image was based on Ubuntu. This changes the base image for default to be UBI minimal.

The image has been changed in elastic#116739

The image has been changed in #116739

The image has been changed in elastic#116739

…Ubuntu (elastic#116739) Previously default Docker image was based on Ubuntu. This changes the base image for default to be UBI minimal.

The image has been changed in elastic#116739

jozala added >non-issue :Delivery/Cloud Cloud-specific packaging and deployment labels Nov 13, 2024

elasticsearchmachine added the v9.0.0 label Nov 13, 2024

jozala added :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts >enhancement and removed >non-issue labels Nov 13, 2024

jozala commented Nov 14, 2024

View reviewed changes

breskeby reviewed Nov 14, 2024

View reviewed changes

breskeby approved these changes Nov 14, 2024

View reviewed changes

breskeby requested changes Nov 14, 2024

View reviewed changes

jozala commented Nov 14, 2024

View reviewed changes

jozala requested a review from breskeby November 14, 2024 20:08

jozala marked this pull request as ready for review November 14, 2024 20:09

jozala requested a review from a team as a code owner November 14, 2024 20:09

elasticsearchmachine added the Team:Delivery Meta label for Delivery team label Nov 14, 2024

mark-vieira approved these changes Nov 14, 2024

View reviewed changes

breskeby approved these changes Nov 15, 2024

View reviewed changes

jozala force-pushed the ubi-as-default-docker-image branch 2 times, most recently from 3970ce5 to a67269d Compare November 22, 2024 08:58

jozala added 6 commits November 22, 2024 13:46

Make UBI a default Docker image base

6270616

Previously default Docker image was based on Ubuntu. This changes the base image for default to be UBI minimal.

Cleanup after removal of UBI docker image

dba2c84

Fix compilation issue

5f9f364

Removed switch expression from Gradle as it is not supported in this version of Groovy

Correct Dockerfile template

ab0512d

Triggering tests for default Docker image on PR

1443380

Use matrix for the packaging-tests build definition

718971a

jozala force-pushed the ubi-as-default-docker-image branch from a67269d to 718971a Compare November 22, 2024 12:52

jozala added the >breaking label Nov 22, 2024

jozala changed the title ~~Make UBI a default Docker image base~~ Change default container image to be based on UBI minimal instead of Ubuntu Nov 22, 2024

jozala removed the >breaking label Nov 22, 2024

jozala merged commit bd18787 into elastic:main Nov 22, 2024
17 checks passed

brianseeders mentioned this pull request Nov 22, 2024

Remove some leftover references to the UBI docker image #117391

Merged

jozala added a commit to jozala/elasticsearch that referenced this pull request Nov 25, 2024

Changelog for default container image change to UBI

c1d0b42

The image has been changed in elastic#116739

jozala mentioned this pull request Nov 25, 2024

Changelog for default container image change to UBI #117482

Merged

jozala added a commit to jozala/elasticsearch that referenced this pull request Nov 25, 2024

Changelog for default container image change to UBI

a9698d0

The image has been changed in elastic#116739

jozala added a commit to jozala/elasticsearch that referenced this pull request Nov 26, 2024

Changelog for default container image change to UBI

dc62204

The image has been changed in elastic#116739

jozala added a commit that referenced this pull request Nov 26, 2024

Changelog for default container image change to UBI (#117482)

5a749a3

The image has been changed in #116739

cbuescher pushed a commit to cbuescher/elasticsearch that referenced this pull request Nov 27, 2024

Changelog for default container image change to UBI (elastic#117482)

ec016d3

The image has been changed in elastic#116739

alexey-ivanov-es pushed a commit to alexey-ivanov-es/elasticsearch that referenced this pull request Nov 28, 2024

Changelog for default container image change to UBI (elastic#117482)

e28dfc3

The image has been changed in elastic#116739

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change default container image to be based on UBI minimal instead of Ubuntu #116739

Change default container image to be based on UBI minimal instead of Ubuntu #116739

jozala commented Nov 13, 2024 •

edited

Loading

jozala Nov 14, 2024

jozala Nov 14, 2024

breskeby Nov 14, 2024

breskeby Nov 14, 2024

breskeby Nov 14, 2024

breskeby Nov 14, 2024

jozala Nov 14, 2024

breskeby Nov 14, 2024

jozala Nov 14, 2024

breskeby left a comment •

edited

Loading

breskeby left a comment •

edited

Loading

jozala Nov 14, 2024

mark-vieira Nov 14, 2024

breskeby Nov 15, 2024

elasticsearchmachine commented Nov 14, 2024

mark-vieira left a comment

Change default container image to be based on UBI minimal instead of Ubuntu #116739

Change default container image to be based on UBI minimal instead of Ubuntu #116739

Conversation

jozala commented Nov 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

breskeby left a comment • edited Loading

Choose a reason for hiding this comment

breskeby left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elasticsearchmachine commented Nov 14, 2024

mark-vieira left a comment

Choose a reason for hiding this comment

jozala commented Nov 13, 2024 •

edited

Loading

breskeby left a comment •

edited

Loading

breskeby left a comment •

edited

Loading