From acae07113f27c49bd5ed2df2403833772e780a34 Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Mon, 11 Nov 2019 15:41:04 -0500 Subject: [PATCH] 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. --- distribution/docker/oss-ubi-docker-build-context/build.gradle | 4 ++-- distribution/docker/ubi-docker-build-context/build.gradle | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distribution/docker/oss-ubi-docker-build-context/build.gradle b/distribution/docker/oss-ubi-docker-build-context/build.gradle index 313adb19187..acae9f68d8e 100644 --- a/distribution/docker/oss-ubi-docker-build-context/build.gradle +++ b/distribution/docker/oss-ubi-docker-build-context/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'base' task buildOssUbiDockerBuildContext(type: Tar) { extension = 'tar.gz' compression = Compression.GZIP - archiveClassifier = "oss-ubi7-docker-build-context" - archiveBaseName = "elasticsearch" + archiveClassifier = "docker-build-context" + archiveBaseName = "elasticsearch-oss-ubi7" with dockerBuildContext(true, true, false) } diff --git a/distribution/docker/ubi-docker-build-context/build.gradle b/distribution/docker/ubi-docker-build-context/build.gradle index 0186c0a313d..941bb0c89fc 100644 --- a/distribution/docker/ubi-docker-build-context/build.gradle +++ b/distribution/docker/ubi-docker-build-context/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'base' task buildUbiDockerBuildContext(type: Tar) { extension = 'tar.gz' compression = Compression.GZIP - archiveClassifier = "ubi7-docker-build-context" - archiveBaseName = "elasticsearch" + archiveClassifier = "docker-build-context" + archiveBaseName = "elasticsearch-ubi7" with dockerBuildContext(false, true, false) }