Skip to content

Commit c4e7528

Browse files
authored
Fix plugin installation in Docker container as non-default user (#63807)
1 parent 3d3837d commit c4e7528

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

distribution/docker/src/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ RUN tar zxf /opt/elasticsearch.tar.gz --strip-components=1
207207
# Configure the distribution for Docker
208208
RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env
209209
RUN mkdir -p config config/jvm.options.d data logs
210-
RUN chmod 0775 config config/jvm.options.d data logs
210+
RUN chmod 0775 config config/jvm.options.d data logs plugins
211211
COPY config/elasticsearch.yml config/log4j2.properties config/
212212
RUN chmod 0660 config/elasticsearch.yml config/log4j2.properties
213213

qa/os/src/test/java/org/elasticsearch/packaging/util/Docker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -526,9 +526,9 @@ private static void verifyOssInstallation(Installation es) {
526526
final String homeDir = passwdResult.stdout.trim().split(":")[5];
527527
assertThat(homeDir, equalTo("/usr/share/elasticsearch"));
528528

529-
Stream.of(es.home, es.data, es.logs, es.config).forEach(dir -> assertPermissionsAndOwnership(dir, p775));
529+
Stream.of(es.home, es.data, es.logs, es.config, es.plugins).forEach(dir -> assertPermissionsAndOwnership(dir, p775));
530530

531-
Stream.of(es.plugins, es.modules).forEach(dir -> assertPermissionsAndOwnership(dir, p755));
531+
Stream.of(es.modules).forEach(dir -> assertPermissionsAndOwnership(dir, p755));
532532

533533
Stream.of("elasticsearch.keystore", "elasticsearch.yml", "jvm.options", "log4j2.properties")
534534
.forEach(configFile -> assertPermissionsAndOwnership(es.config(configFile), p660));

0 commit comments

Comments
 (0)