Skip to content

Commit e7dd999

Browse files
authored
[8.x] Fix uri and ironbank docker distribution build (elastic#126004)
Fixes a merge conflict in our docker file used for building docker based distributions
1 parent b92b537 commit e7dd999

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

distribution/docker/src/docker/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,10 @@ RUN groupadd -g 1000 elasticsearch && \
232232
adduser -G elasticsearch -u 1000 elasticsearch -D --home /usr/share/elasticsearch elasticsearch && \
233233
adduser elasticsearch root && \
234234
chown -R 0:0 /usr/share/elasticsearch
235+
<% } else { %>
236+
RUN groupadd -g 1000 elasticsearch && \\
237+
adduser -u 1000 -g 1000 -G 0 -d /usr/share/elasticsearch elasticsearch && \\
238+
chown -R 0:0 /usr/share/elasticsearch
235239
<% } %>
236240
237241
ENV ELASTIC_CONTAINER true

0 commit comments

Comments
 (0)