Skip to content

Commit

Permalink
reduce effort during build of docker images (#16619) (#16620)
Browse files Browse the repository at this point in the history
there's no need to build jdk-less and windows tarballs for docker images
so this change simplifies the build process.

It should reduce the time spent needed to build docker images.

(cherry picked from commit 9eced9a)

Co-authored-by: João Duarte <[email protected]>
  • Loading branch information
github-actions[bot] and jsvd authored Oct 31, 2024
1 parent 1cbd092 commit 6c8e086
Showing 1 changed file with 21 additions and 4 deletions.
25 changes: 21 additions & 4 deletions rakelib/artifacts.rake
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@ namespace "artifact" do
build_zip(*license_details, platform: '-no-jdk')
end

desc "Build jdk bundled tar.gz of default logstash plugins with all dependencies for docker"
task "archives_docker" => ["prepare", "generate_build_metadata"] do
license_details = ['ELASTIC-LICENSE']
@bundles_jdk = true
create_archive_pack(license_details, "x86_64", "linux", "darwin")
create_archive_pack(license_details, "arm64", "linux", "darwin")
end

def create_archive_pack(license_details, arch, *oses)
oses.each do |os_name|
puts("[artifact:archives] Building tar.gz/zip of default plugins for OS: #{os_name}, arch: #{arch}")
Expand Down Expand Up @@ -213,6 +221,15 @@ namespace "artifact" do
build_zip(*license_details, platform: '-no-jdk')
end

desc "Build jdk bundled OSS tar.gz of default logstash plugins with all dependencies for docker"
task "archives_docker_oss" => ["prepare-oss", "generate_build_metadata"] do
#with bundled JDKs
@bundles_jdk = true
license_details = ['APACHE-LICENSE-2.0', "-oss", oss_exclude_paths]
create_archive_pack(license_details, "x86_64", "linux", "darwin")
create_archive_pack(license_details, "arm64", "linux", "darwin")
end

desc "Build an RPM of logstash with all dependencies"
task "rpm" => ["prepare", "generate_build_metadata"] do
#with bundled JDKs
Expand Down Expand Up @@ -300,25 +317,25 @@ namespace "artifact" do
end

desc "Build docker image"
task "docker" => ["prepare", "generate_build_metadata", "archives"] do
task "docker" => ["prepare", "generate_build_metadata", "archives_docker"] do
puts("[docker] Building docker image")
build_docker('full')
end

desc "Build OSS docker image"
task "docker_oss" => ["prepare-oss", "generate_build_metadata", "archives_oss"] do
task "docker_oss" => ["prepare-oss", "generate_build_metadata", "archives_docker_oss"] do
puts("[docker_oss] Building OSS docker image")
build_docker('oss')
end

desc "Build UBI8 docker image"
task "docker_ubi8" => %w(prepare generate_build_metadata archives) do
task "docker_ubi8" => %w(prepare generate_build_metadata archives_docker) do
puts("[docker_ubi8] Building UBI docker image")
build_docker('ubi8')
end

desc "Build wolfi docker image"
task "docker_wolfi" => %w(prepare generate_build_metadata archives) do
task "docker_wolfi" => %w(prepare generate_build_metadata archives_docker) do
puts("[docker_wolfi] Building Wolfi docker image")
build_docker('wolfi')
end
Expand Down

0 comments on commit 6c8e086

Please sign in to comment.