Skip to content

Provide compressed docker image exports for DRA process #91593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elasticsearchmachine merged 2 commits into from
Nov 15, 2022
Merged

Provide compressed docker image exports for DRA process #91593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4dc010
Provide compressed docker image exports for DRA process
breskeby Nov 15, 2022
2820599
Fix classifier handling
breskeby Nov 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci/jobs.t/elastic+elasticsearch+periodic+dra-snapshots.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
-Ddra.artifacts.dependency.ml-cpp=${ML_CPP_BUILD_ID} \
-Dcsv=$WORKSPACE/build/distributions/dependencies-${ES_VERSION}-SNAPSHOT.csv \
buildReleaseArtifacts \
exportDockerImages \
exportCompressedDockerImages \
:distribution:generateDependenciesReport

unset VAULT_TOKEN
Expand Down
17 changes: 16 additions & 1 deletion distribution/docker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ boolean isArchitectureSupported(Architecture architecture) {
}

def exportDockerImages = tasks.register("exportDockerImages")
def exportCompressedDockerImages = tasks.register("exportCompressedDockerImages")

/*
* The export subprojects write out the generated Docker images to disk, so
Expand Down Expand Up @@ -514,7 +515,6 @@ subprojects { Project subProject ->
"-o",
tarFile,
"elasticsearch${base.suffix}:${architecture.classifier}"

dependsOn(parent.path + ":" + buildTaskName)
onlyIf { isArchitectureSupported(architecture) }
}
Expand All @@ -523,6 +523,21 @@ subprojects { Project subProject ->
dependsOn exportTask
}

def compressExportTask = tasks.register(taskName("compress", architecture, base, 'DockerImageExport'), Tar) {
it.from(project.tarTree(tarFile))
archiveExtension = 'tar.gz'
it.setCompression(Compression.GZIP)
it.getArchiveBaseName().set("elasticsearch${base.suffix}-${VersionProperties.elasticsearch}-docker-image")
it.getArchiveVersion().set("")
it.getArchiveClassifier().set(architecture == Architecture.AARCH64 ? 'aarch64' : '')
it.getDestinationDirectory().set(new File(project.parent.buildDir, 'distributions'))
it.dependsOn(exportTask)
}

exportCompressedDockerImages.configure {
dependsOn compressExportTask
}

artifacts.add('default', file(tarFile)) {
type 'tar'
name artifactName
Expand Down