Skip to content

Conversation

@breskeby
Copy link
Contributor

@breskeby breskeby commented May 9, 2025

  • Put Dockerfiles in specific distro specific folders keeping "Dockerfile" naming convention
  • Allows better ide support
  • Allows easier renovate integration
  • gradle build classpath not invalidated due to docker update as build-tools-internal classes do not change

@breskeby breskeby requested a review from a team as a code owner May 9, 2025 08:55
@breskeby breskeby added >non-issue :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team auto-backport Automatically create backport pull requests when merged v8.19.0 v9.1.0 labels May 9, 2025
@breskeby breskeby self-assigned this May 9, 2025
@elasticsearchmachine
Copy link
Collaborator

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

@breskeby breskeby added the :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts label May 9, 2025
@breskeby breskeby requested a review from jozala May 9, 2025 15:31
@breskeby breskeby force-pushed the docker-fips branch 2 times, most recently from 0f2a14e to 3b995f1 Compare May 16, 2025 16:43
breskeby added 5 commits May 19, 2025 15:39
- put Dockerfiles in specific distro specific folders keeping "Dockerfile" naming convention
- Allows better ide support
- Allows easier renovate integration
- makes renovate configuration easier
This lives now in the Dockerfile content directly
@breskeby breskeby merged commit 38c90ca into elastic:main May 19, 2025
18 checks passed
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
8.19 Commit could not be cherrypicked due to conflicts
9.0 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 127960

breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 20, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile
#	renovate.json
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 20, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/default/Dockerfile
#	renovate.json
@breskeby
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.0
8.19

Questions ?

Please refer to the Backport tool documentation

breskeby added a commit that referenced this pull request May 21, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/cloud_ess_fips/Dockerfile
#	renovate.json
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 21, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/default/Dockerfile
#	renovate.json
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 22, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/default/Dockerfile
#	renovate.json
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 26, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/default/Dockerfile
#	renovate.json
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 26, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/default/Dockerfile
#	renovate.json
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 28, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/default/Dockerfile
#	renovate.json
breskeby added a commit to breskeby/elasticsearch that referenced this pull request May 30, 2025
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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/default/Dockerfile
#	renovate.json
breskeby added a commit that referenced this pull request May 30, 2025
…128187)

* 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

(cherry picked from commit 38c90ca)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java
#	distribution/docker/src/docker/dockerfiles/default/Dockerfile
#	renovate.json

* Fix ubuntu based default docker image;

also remove muted test

* Cleanup dockerfile

* Fix merge in docker default

* Fix merge issue

* Fix exit code 100 on docker build apt-get run
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged backport pending :Delivery/Build Build or test infrastructure :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts >non-issue Team:Delivery Meta label for Delivery team v8.19.0 v9.0.2 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants