Commit graph

232 commits

Author SHA1 Message Date
Rene Groeschke
5836dd3b39
[Fips] Explicitly set trustStoreType to BCFKS in FIPS docker image (#129385)
We see an certificate issue when using fips docker image creating searchable snapshots in aws
and gcs. This is likely related to a configuration issue not explicitly setting the trust store
type for our bcfks cacerts
2025-06-13 17:01:11 +02:00
Richard Dennehy
63da93d4c3
Delegated authorization using Microsoft Graph (SDK) (#128396)
* Delegated authorization using Microsoft Graph (SDK)
---------

Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
Co-authored-by: Johannes Freden Jansson <johannes.freden@elastic.co>
Co-authored-by: Johannes Fredén <109296772+jfreden@users.noreply.github.com>
2025-06-12 11:03:32 +02:00
Rene Groeschke
649b505731
[Build] Address further dockerhub feedback on default Dockerfile (#128686)
* [Build] Address further dockerhub feedback on default Dockerfile
* Bring back license folder
* Minor cleanup
* polishing
2025-06-05 08:02:37 +02:00
elastic-renovate-prod[bot]
488bd6a846
Update wolfi (versioned) (#128516)
This PR contains the following updates:

| Package | Type | Update | Change | |---|---|---|---| |
docker.elastic.co/wolfi/chainguard-base |  | digest | `55ee1dc` ->
`3d19648` | | docker.elastic.co/wolfi/chainguard-base | final | digest |
`55ee1dc` -> `3d19648` | | docker.elastic.co/wolfi/chainguard-base |
stage | digest | `55ee1dc` -> `3d19648` | |
docker.elastic.co/wolfi/chainguard-base-fips |  | digest | `a9e07d9` ->
`68e0781` | | docker.elastic.co/wolfi/chainguard-base-fips | final |
digest | `a9e07d9` -> `68e0781` | |
docker.elastic.co/wolfi/chainguard-base-fips | stage | digest |
`a9e07d9` -> `68e0781` |

---

### Configuration

📅 **Schedule**: Branch creation - "after 1pm on tuesday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once
you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate
Bot](https://redirect.github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyI6RGVsaXZlcnkvUGFja2FnaW5nIiwiPm5vbi1pc3N1ZSIsIlRlYW06RGVsaXZlcnkiLCJhdXRvLW1lcmdlLXdpdGhvdXQtYXBwcm92YWwiXX0=-->
2025-05-28 01:50:20 +10:00
elastic-renovate-prod[bot]
f6e4a26480
chore(deps): update wolfi (versioned) (#126468)
This PR contains the following updates:

| Package | Type | Update | Change | |---|---|---|---| |
docker.elastic.co/wolfi/chainguard-base |  | digest | `29150cd` ->
`55ee1dc` | | docker.elastic.co/wolfi/chainguard-base | final | digest |
`29150cd` -> `55ee1dc` | | docker.elastic.co/wolfi/chainguard-base |
stage | digest | `29150cd` -> `55ee1dc` | |
docker.elastic.co/wolfi/chainguard-base-fips |  | digest | `ebfc3f1` ->
`a9e07d9` | | docker.elastic.co/wolfi/chainguard-base-fips | final |
digest | `ebfc3f1` -> `a9e07d9` | |
docker.elastic.co/wolfi/chainguard-base-fips | stage | digest |
`ebfc3f1` -> `a9e07d9` |

---

### Configuration

📅 **Schedule**: Branch creation - "after 1pm on tuesday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once
you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config
help](https://redirect.github.com/renovatebot/renovate/discussions) if
that's undesired.

---

 - [x] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate
Bot](https://redirect.github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOS4xMDcuMCIsInVwZGF0ZWRJblZlciI6IjM5LjEwNy4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyI6RGVsaXZlcnkvUGFja2FnaW5nIiwiPm5vbi1pc3N1ZSIsIlRlYW06RGVsaXZlcnkiLCJhdXRvLW1lcmdlLXdpdGhvdXQtYXBwcm92YWwiXX0=-->
2025-05-23 05:19:35 +10:00
github-actions[bot]
2d09714260
chore: deps(ironbank): Bump ubi version to 9.6 (#128171)
Made with ❤️️ by updatecli

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2025-05-20 11:15:55 +02:00
Rene Groeschke
38c90ca8d4
Restructure docker files for docker distributions (#127960)
Restructures docker files for docker distributions

- Put Dockerfiles in specific distro specific folders keeping "Dockerfile" naming convention
- Allows better ide support
- Allows easier renovate integration
- Explicitly set base image in dockerfile
- simplify renovate configuration
- Cleanup DockerBase file to not contain ess fips base image information

This lives now in the Dockerfile content directly

* Workaround docker test issue

* Fix labels for fips image
2025-05-19 19:47:34 +02:00
Cas Donoghue
197d9b32cc
Provide default entrypoint for the cloud-ess-fips image (#127788)
In order to match the pattern for the other Cloud ESS image, provide a default
entrypoint to the container that points to the configured docker entrypoint.
This is described in
1a1763c591/distribution/docker/README.md (L16-L19)
and implemented in 1a1763c591/distribution/docker/src/docker/Dockerfile.ess (L37-L40)
2025-05-07 00:38:05 +02:00
Rene Groeschke
aee4465768
Ensure BCFKS based cacert truststore is used for cloud ess fips (#127716)
* Ensure we use BCFKS based cacert truststore for cloud ess fips
* Make truststore default password 14 characters
2025-05-06 08:26:43 +02:00
Rene Groeschke
d546fc8217
Adjust docker fips entrypoint and cmd (#127630)
Also extract docker fips configuration in explicit docker file
2025-05-02 14:43:55 +02:00
Rene Groeschke
aa309515f8
Rename docker fips image to cloud-ess-fips (#127561) 2025-04-30 15:56:24 +02:00
Mariusz Józala
db04c200f0
Keep publishing Docker labels in specific Docker Hub context (#126989)
These labels are incompatible with the Docker Hub, but for now we need
to keep them to override the labels coming from the base image.
2025-04-24 09:04:58 +02:00
Rene Groeschke
31995ace2d
Add docker hub specific docker context (#126625)
The labels we require for openshift are incompatible with docker hub policies. therefore we need to use different docker contexts for those.
2025-04-11 13:30:00 +02:00
Rene Groeschke
ca195736ca
Address review feedback on es default docker image (#126330)
This addresses feedback we got for our default image at https://github.com/docker-library/official-images/pull/18692
This also introduces separate docker source files to make maintaining those easier.

We cannot take over all suggested changes as we require certain settings to have our packaging tests pass as expected.
2025-04-10 17:14:22 +02:00
Mariusz Józala
afe503f02f
[CI] Use official UBI9 image for testing (#126455)
Internal UBI images from `docker.elastic.co` are planned to be removed.
2025-04-09 09:05:26 +02:00
Rene Groeschke
6cfb2e9d4a
Resolve fips specific metricbeat and filebeat libs for ES fips image (#126312)
Also updated DRA handling to reflect resolving fips specific artifacts
2025-04-05 06:47:30 +11:00
Rene Groeschke
611f5cba4f
[BUILD] Support AARCH64 for docker fips images (#125927)
This updates the docker fips base image which support arm and x84
architectures
2025-03-31 22:41:04 +11:00
Rene Groeschke
9dd0228990
Fix fips tests (#125754)
reported as broken due to issue in gradle setup
2025-03-27 21:31:50 +11:00
Rene Groeschke
653c179b08
[Build] Add FIPS docker image for GovCloud (#117152)
- Adds docker image based on chainguard base fips image
- x86 only for now as the base image is x86 only
- the image does not provide any elasticsearch.yml configuration. for testing purposes you can follow the elasticsearch fips guide available at https://github.com/elastic/FIPSGuide/tree/main/elasticsearch

The image is shipped with:
- org.bouncycastle:bc-fips:1.0.2.5 and org.bouncycastle:bctls-fips:1.0.19 in Elasticsearch libs folder
- config/jvm.options.d/fips.options for fips specific JVM options
- fips_java.security file
- fips_java.policy

Out of scope:
- Add packaging test coverage (part of later PR as we want to provide that image for testing early and packaging tests require more general restructuring for support fips scenarios)
2025-03-26 16:15:15 +01:00
Julien Mailleret
e5cf597782
Fix IronBank hardening_manifest CI test (#124579)
This commit fix the IronBank hardening_manifest CI test that expect the
hardening_manifest.yaml values to match `'^(?!\\s*$)[ -~|]*$'` regex:

```
| hardening_manifest           | ERROR    | Hardening Manifest failed jsonschema validation
| hardening_manifest           | ERROR    | Verify Hardening Manifest content
| hardening_manifest           | ERROR    | 'Rene Gröschke' does not match '^(?!\\s*$)[ -~|]*$'
```

43219286

cc @breskeby 

<!-- Thank you for your interest in and contributing to Elasticsearch!
There are a few simple things to check before submitting your pull
request that can help with the review process. You should delete these
items from your submission, but they are here to help bring them to your
attention. -->

- Have you signed the [contributor license agreement](https://www.elastic.co/contributor-agreement)?
- Have you followed the [contributor guidelines](https://github.com/elastic/elasticsearch/blob/main/CONTRIBUTING.md)?
- If submitting code, have you built your formula locally prior to submission with `gradle check`?
- If submitting code, is your pull request against main? Unless there is a good reason otherwise, we prefer pull requests against main and will backport as needed.
- If submitting code, have you checked that your submission is for an [OS and architecture that we support](https://www.elastic.co/support/matrix#show_os)?
- If you are submitting this code for a class then read our [policy](https://github.com/elastic/elasticsearch/blob/main/CONTRIBUTING.md#contributing-as-part-of-a-class) for that.
2025-03-12 06:22:10 +11:00
Rene Groeschke
496c38e5a5
Reapply "Update Gradle wrapper to 8.13 (#122421)" (#123889) (#123896)
This reverts commit 36660f2e5f.
2025-03-05 08:02:13 +01:00
Rene Groeschke
36660f2e5f
Revert "Update Gradle wrapper to 8.13 (#122421)" (#123889)
This reverts commit e19b2264af.
2025-03-03 15:51:07 +01:00
Rene Groeschke
e19b2264af
Update Gradle wrapper to 8.13 (#122421)
* Fix Gradle Deprecation warning as declaring an is- property with a Boolean type has been deprecated.
* Make use of new layout.settingsFolder api to address some cross project references
* Fix buildParams snapshot check for multiprojet projects
2025-03-03 14:10:00 +01:00
Rene Groeschke
7b6d4d192f
[Gradle] Fix deprecation warning in release tests after 8.12 update (#119608) 2025-01-07 19:08:06 +11:00
Mark Vieira
5960af62c1
Fix vcs revision label in docker images (#119531) 2025-01-03 10:15:46 -08:00
Mark Vieira
e87020e9fa
Don't cache docker export tasks (#119478) 2025-01-03 09:04:56 -08:00
Rene Groeschke
ba61f8c7f7
Update Gradle wrapper to 8.12 (#118683)
This updates the gradle wrapper to 8.12

We addressed deprecation warnings due to the update that includes:

- Fix change in TestOutputEvent api
- Fix deprecation in groovy syntax
- Use latest ospackage plugin containing our fix
- Remove project usages at execution time
- Fix deprecated project references in repository-old-versions
2024-12-30 15:34:24 +01:00
github-actions[bot]
2c736f49b0
chore: deps(ironbank): Bump ubi version to 9.5 (#119203) 2024-12-23 08:28:44 -08:00
github-actions[bot]
46356bd64d
chore: deps(ironbank): Bump ubi version to 9.5 (#119039)
<Actions>     <action
id="ad27da7f660d61c82c61599e0e6945827ced1590f4bf36a5f74db07e99c04215">  
<h3>deps: Bump ironbank version</h3>         <details
id="c8ee27cd13736547d240c88751dee86bddfbda339d0ee25795d0cc066ff6ea01">  
<summary>deps(ironbank): Bump ubi version to 9.5</summary>            
<p>change detected:&#xA;&#x9;* key &#34;$.args.BASE_TAG&#34; updated
from &#34;\&#34;9.4\&#34;&#34; to &#34;\&#34;9.5\&#34;&#34;, in file
&#34;distribution/docker/src/docker/iron_bank/hardening_manifest.yaml&#34;</p>
</details>         <details
id="ddfe323476a100a4fecf1aab633e1209ffebe2f0e55366500df03a529b067050">  
<summary>deps(ironbank): Bump ubi version to 9.5</summary>            
<p>changed lines [25] of file
&#34;/tmp/updatecli/github/elastic/elasticsearch/distribution/docker/src/docker/Dockerfile&#34;</p>
</details>         <a
href="1240723046">GitHub
Action workflow link</a>     </action> </Actions>

---

<table>   <tr>     <td width="77">       <img
src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli logo"
width="50" height="50">     </td>     <td>       <p>         Created
automatically by <a href="https://www.updatecli.io/">Updatecli</a>      
</p>       <details><summary>Options:</summary>         <br />        
<p>Most of Updatecli configuration is done via <a
href="https://www.updatecli.io/docs/prologue/quick-start/">its
manifest(s)</a>.</p>         <ul>           <li>If you close this pull
request, Updatecli will automatically reopen it, the next time it
runs.</li>           <li>If you close this pull request and delete the
base branch, Updatecli will automatically recreate it, erasing all
previous commits made.</li>         </ul>         <p>           Feel
free to report any issues at <a
href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br
/>           If you find this tool useful, do not hesitate to star <a
href="https://github.com/updatecli/updatecli/stargazers">our GitHub
repository</a> as a sign of appreciation, and/or to tell us directly on
our <a
href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>!     
</p>       </details>     </td>   </tr> </table>
2024-12-20 06:55:35 +11:00
Mark Vieira
8d1f4565a6
Update IronBank hardening manifest maintainers (#118175) 2024-12-16 08:45:06 -08:00
Mariusz Józala
bd18787af5
Change default container image to be based on UBI minimal instead of Ubuntu (#116739)
Previously default Docker image was based on Ubuntu. This changes the
base image for default to be UBI minimal.
2024-11-22 14:55:25 +01:00
Rene Groeschke
13c8aaeffa
[Gradle] Remove static use of BuildParams (#115122)
Static fields dont do well in Gradle with configuration cache enabled.

- Use buildParams extension in build scripts
- Keep BuildParams.ci for now for easy serverless migration
-  Tweak testing doc
2024-11-15 17:58:57 +01:00
Rene Groeschke
482d2aced5
Remove unused elasticsearch cloud docker image (#115357) 2024-10-25 02:58:36 +11:00
Rene Groeschke
f1f5ee06a3
Replace cloud-ess docker image with wolfi-ess (#114413)
* Replace cloud-ess docker image with wolfi-ess
   We just replaced the existing implementation of cloud-ess with what was wolfi-ess which is a wolfi based ess image. 
   The cloud image itself will be removed in a future commit it was not used anywhere

* Switch to test cloud docker image instead of default docker in packaging pr tests. 
  This adds way more coverage than the default docker image which is also barely touched
2024-10-11 21:58:15 +02:00
Rene Groeschke
190513dce7
Update wolfi image and fix breaking change (#114390) 2024-10-10 09:23:10 +02:00
Rene Groeschke
54c83d7fa7
Add wolfi ess docker image (#113810) 2024-10-04 11:01:49 +02:00
Brian Seeders
e9b303322c
Fix packaging tests after addition of new wolfi-based image (#112831)
* Add more missing wolfi references to fix tests
* packaging tests require access to docker registry
* Fix symlink for es distributions jdk cacerts in wolfi docker
* Fix native support on wolfi images
* Fix provided keystore packaging tests for wolfi
* Add utils used for testing to wolfi image
* Explicitly set default shell to bash in docker images
* Fix docker config issues
* Apply review feedback around docker login

---------

Co-authored-by: Rene Groeschke <rene@elastic.co>
2024-09-26 11:11:01 +02:00
Mark Vieira
a59c182f9f
Add AGPLv3 as a supported license 2024-09-13 15:29:46 -07:00
Brian Seeders
5c9710caf5
Fix wolfi docker tasks (#112721) 2024-09-10 17:39:53 -04:00
Rene Groeschke
4dee614707
Add chainguard docker image (#112103) 2024-09-06 10:32:42 -07:00
Victor Martinez
e7c0ba953a
Update IronBank docker image base to ubi:9.4 (#111743) 2024-08-28 19:18:58 +02:00
Rene Groeschke
7226100458
Make :distribution:docker:check Gradle configuration cache compatible (#109083)
fix cache compatibility issue in TestFixturesPlugin and support
yamlRestTest in `:distribution:docker:yamlRestTest`
2024-06-05 19:23:04 +10:00
Rene Groeschke
2704d3a8d1
Remove cross project support in TestFixturesPlugin (#109077)
- One step closer to configuration cache support
- Crossproject support has been replaced by using testcontainer based fixtures
2024-05-27 17:59:14 +02:00
Rene Groeschke
077d8be599
Fix typo in BuildParams.isCi() usage (#104812) 2024-01-26 09:24:12 -05:00
Rene Groeschke
ab8ee60bba
Fix SamlAuthenticationIT flakyness (#103867) 2024-01-24 13:44:31 -05:00
Jon
c0bfab9338
Update IronBank docker image base to ubi:9.3 (#102721) 2023-12-06 10:18:47 -08:00
Jon
6787765c37
Update IronBank BASE_IMAGE with ironbank prefix (#102720)
This supports local testing.  It should not be included in
hardening_manifest.yml, which injects the scope at runtime.
2023-11-30 13:47:33 -08:00
Mark Vieira
328ebc4145
Update IronBank docker image base to ubi:9.2 (#101393) 2023-10-26 11:29:44 -07:00
Rene Groeschke
69d87e1bfd
Rework beats artifacts resolution in docker build (#100157)
* Rework metricbeat artifacts resolution to avoid misleading error message
* Pass File object to beats repo uri to workaround parsing problems
2023-10-06 17:04:46 +02:00
Rene Groeschke
cc2a711b2d
Always use es tarball for creating IronBank docker context (#95958)
This fixes an issue with building iron bank images that are handled differently
than other docker images.
2023-05-09 17:39:35 +02:00