-
Notifications
You must be signed in to change notification settings - Fork 24.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Introduce Cloud docker variant (#74980) Closes #74795. Introduce two Docker image variants for Cloud. The first bundles (actually installs) the S3, Azure and GCS repository plugins. The second bundles all official plugins, but only installs the repository plugins. Both images also bundle Filebeat and Metricbeat. The testing utils have been refactored to introduce a `docker` sub-package. This allows the static `Docker.containerId` to be shared without needing all the code in one big class. The code for checking file ownership / permissions has also been refactored to a more Hamcrest style, using a custom Docker file matcher. * Don't build Cloud docker images on assemble * Backport fixes * Tweak Dockerfile.cloud-ess Some Docker builds are apparently complaining about the `COPY` syntax in this file, so try and fix it as Docker suggests. Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
- Loading branch information
1 parent
a921744
commit f9e8bb5
Showing
28 changed files
with
825 additions
and
182 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
.../elasticsearch/gradle/internal/distribution/DockerCloudElasticsearchDistributionType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
package org.elasticsearch.gradle.internal.distribution; | ||
|
||
import org.elasticsearch.gradle.ElasticsearchDistributionType; | ||
|
||
public class DockerCloudElasticsearchDistributionType implements ElasticsearchDistributionType { | ||
|
||
DockerCloudElasticsearchDistributionType() {} | ||
|
||
@Override | ||
public String getName() { | ||
return "dockerCloud"; | ||
} | ||
|
||
@Override | ||
public boolean isDocker() { | ||
return true; | ||
} | ||
} |
26 changes: 26 additions & 0 deletions
26
...asticsearch/gradle/internal/distribution/DockerCloudEssElasticsearchDistributionType.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License | ||
* 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
* in compliance with, at your election, the Elastic License 2.0 or the Server | ||
* Side Public License, v 1. | ||
*/ | ||
|
||
package org.elasticsearch.gradle.internal.distribution; | ||
|
||
import org.elasticsearch.gradle.ElasticsearchDistributionType; | ||
|
||
public class DockerCloudEssElasticsearchDistributionType implements ElasticsearchDistributionType { | ||
|
||
DockerCloudEssElasticsearchDistributionType() {} | ||
|
||
@Override | ||
public String getName() { | ||
return "dockerCloudEss"; | ||
} | ||
|
||
@Override | ||
public boolean isDocker() { | ||
return true; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.