github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 15:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix plugin installation in Docker container as non-default user (#63807)

Browse source
This commit is contained in:
Przemysław Hejman 2020-10-16 17:08:28 +02:00 • committed by GitHub
parent 3d3837da14
commit c4e75281e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distribution/docker/src/docker/Dockerfile
View file

@ -207,7 +207,7 @@ RUN tar zxf /opt/elasticsearch.tar.gz --strip-components=1
# Configure the distribution for Docker
RUN sed -i -e 's/ES_DISTRIBUTION_TYPE=tar/ES_DISTRIBUTION_TYPE=docker/' /usr/share/elasticsearch/bin/elasticsearch-env
RUN mkdir -p config config/jvm.options.d data logs
RUN chmod 0775 config config/jvm.options.d data logs
RUN chmod 0775 config config/jvm.options.d data logs plugins
COPY config/elasticsearch.yml config/log4j2.properties config/
RUN chmod 0660 config/elasticsearch.yml config/log4j2.properties

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

@ -526,9 +526,9 @@ public class Docker {
final String homeDir = passwdResult.stdout.trim().split(":")[5];
assertThat(homeDir, equalTo("/usr/share/elasticsearch"));
Stream.of(es.home, es.data, es.logs, es.config).forEach(dir -> assertPermissionsAndOwnership(dir, p775));
Stream.of(es.home, es.data, es.logs, es.config, es.plugins).forEach(dir -> assertPermissionsAndOwnership(dir, p775));
Stream.of(es.plugins, es.modules).forEach(dir -> assertPermissionsAndOwnership(dir, p755));
Stream.of(es.modules).forEach(dir -> assertPermissionsAndOwnership(dir, p755));
Stream.of("elasticsearch.keystore", "elasticsearch.yml", "jvm.options", "log4j2.properties")
.forEach(configFile -> assertPermissionsAndOwnership(es.config(configFile), p660));