Skip to content

Commit 25bd830

Browse files
authored
Remove some leftover references to the UBI docker image (#117391)
1 parent 7e801e0 commit 25bd830

File tree

4 files changed

+0
-34
lines changed

4 files changed

+0
-34
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ private static String distributionProjectName(ElasticsearchDistribution distribu
173173
if (distribution.getType() == InternalElasticsearchDistributionTypes.DOCKER) {
174174
return projectName + "docker" + archString + "-export";
175175
}
176-
if (distribution.getType() == InternalElasticsearchDistributionTypes.DOCKER_UBI) {
177-
return projectName + "ubi-docker" + archString + "-export";
178-
}
179176
if (distribution.getType() == InternalElasticsearchDistributionTypes.DOCKER_IRONBANK) {
180177
return projectName + "ironbank-docker" + archString + "-export";
181178
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/DockerUbiElasticsearchDistributionType.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/distribution/InternalElasticsearchDistributionTypes.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class InternalElasticsearchDistributionTypes {
1717
public static ElasticsearchDistributionType DEB = new DebElasticsearchDistributionType();
1818
public static ElasticsearchDistributionType RPM = new RpmElasticsearchDistributionType();
1919
public static ElasticsearchDistributionType DOCKER = new DockerElasticsearchDistributionType();
20-
public static ElasticsearchDistributionType DOCKER_UBI = new DockerUbiElasticsearchDistributionType();
2120
public static ElasticsearchDistributionType DOCKER_IRONBANK = new DockerIronBankElasticsearchDistributionType();
2221
public static ElasticsearchDistributionType DOCKER_CLOUD_ESS = new DockerCloudEssElasticsearchDistributionType();
2322
public static ElasticsearchDistributionType DOCKER_WOLFI = new DockerWolfiElasticsearchDistributionType();
@@ -26,7 +25,6 @@ public class InternalElasticsearchDistributionTypes {
2625
DEB,
2726
RPM,
2827
DOCKER,
29-
DOCKER_UBI,
3028
DOCKER_IRONBANK,
3129
DOCKER_CLOUD_ESS,
3230
DOCKER_WOLFI

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER;
5252
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_CLOUD_ESS;
5353
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_IRONBANK;
54-
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_UBI;
5554
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER_WOLFI;
5655
import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.RPM;
5756
import static org.elasticsearch.gradle.internal.util.ParamsUtils.loadBuildParams;
@@ -148,7 +147,6 @@ public void apply(Project project) {
148147
private static Map<ElasticsearchDistributionType, TaskProvider<?>> lifecycleTasks(Project project, String taskPrefix) {
149148
Map<ElasticsearchDistributionType, TaskProvider<?>> lifecyleTasks = new HashMap<>();
150149
lifecyleTasks.put(DOCKER, project.getTasks().register(taskPrefix + ".docker"));
151-
lifecyleTasks.put(DOCKER_UBI, project.getTasks().register(taskPrefix + ".docker-ubi"));
152150
lifecyleTasks.put(DOCKER_IRONBANK, project.getTasks().register(taskPrefix + ".docker-ironbank"));
153151
lifecyleTasks.put(DOCKER_CLOUD_ESS, project.getTasks().register(taskPrefix + ".docker-cloud-ess"));
154152
lifecyleTasks.put(DOCKER_WOLFI, project.getTasks().register(taskPrefix + ".docker-wolfi"));

0 commit comments

Comments
 (0)