Fix names of UBI-based Docker build contexts

This commit fixes the names of the UBI-based Docker build contexts to
lift the ubi component of the name into the archive base name, instead
of the classifier.
This commit is contained in:
Jason Tedor 2019-11-11 15:41:04 -05:00
parent 46ab1db54f
commit acae07113f
No known key found for this signature in database
GPG Key ID: FA89F05560F16BC5
2 changed files with 4 additions and 4 deletions

View File

@ -3,8 +3,8 @@ apply plugin: 'base'
task buildOssUbiDockerBuildContext(type: Tar) { task buildOssUbiDockerBuildContext(type: Tar) {
extension = 'tar.gz' extension = 'tar.gz'
compression = Compression.GZIP compression = Compression.GZIP
archiveClassifier = "oss-ubi7-docker-build-context" archiveClassifier = "docker-build-context"
archiveBaseName = "elasticsearch" archiveBaseName = "elasticsearch-oss-ubi7"
with dockerBuildContext(true, true, false) with dockerBuildContext(true, true, false)
} }

View File

@ -3,8 +3,8 @@ apply plugin: 'base'
task buildUbiDockerBuildContext(type: Tar) { task buildUbiDockerBuildContext(type: Tar) {
extension = 'tar.gz' extension = 'tar.gz'
compression = Compression.GZIP compression = Compression.GZIP
archiveClassifier = "ubi7-docker-build-context" archiveClassifier = "docker-build-context"
archiveBaseName = "elasticsearch" archiveBaseName = "elasticsearch-ubi7"
with dockerBuildContext(false, true, false) with dockerBuildContext(false, true, false)
} }