@@ -116,7 +116,7 @@ RUN set -e ; \
116
116
117
117
COPY docker-entrypoint /usr/local/bin/docker-entrypoint
118
118
RUN groupadd --gid 1000 {{ .BeatName }} && \
119
- useradd -M --uid 1000 --gid 1000 --groups 0 {{ .user }} && \
119
+ useradd -M --uid 1000 --gid 1000 {{ .user }} && \
120
120
chmod 755 /usr/local/bin/docker-entrypoint && \
121
121
true
122
122
@@ -196,10 +196,13 @@ RUN cd {{$beatHome}}/.node \
196
196
&& chmod ugo+rwX -R $NODE_PATH \
197
197
# Install synthetics as a regular user, installing npm deps as root odesn't work
198
198
# fix .node .npm and .synthetics
199
- && chown -R {{ .user }}:{{ .user }} $NODE_PATH
199
+ && chown -R {{ .user }}:{{ .user }} $NODE_PATH \
200
+ && mkdir -p {{ $beatHome }}/.npm/_logs \
201
+ && chown -R {{ .user }}:{{ .user }} {{ $beatHome }}/.npm \
202
+ && chown -R {{ .user }}:{{ .user }} {{ $beatHome }}/.cache
200
203
USER {{ .user }}
201
204
# If this fails dump the NPM logs
202
- RUN (npm i -g --loglevel verbose --engine-strict @elastic/synthetics@stack_release || sh -c 'tail -n +1 /root /.npm/_logs/* && exit 1') && \
205
+ RUN (npm i -g --loglevel verbose --engine-strict @elastic/synthetics@stack_release || sh -c 'tail -n +1 {{ $beatHome }} /.npm/_logs/* && exit 1') && \
203
206
chmod ugo+rwX -R $NODE_PATH
204
207
USER root
205
208
@@ -218,7 +221,6 @@ RUN for iter in {1..10}; do \
218
221
219
222
{{- end }}
220
223
# root group no more for elastic-agent user
221
- RUN gpasswd --delete {{ .user }} root
222
224
USER {{ .user }}
223
225
224
226
0 commit comments