Skip to content

Commit f7ba491

Browse files
Stealthiijk464
authored andcommitted
Do not preserve file attributes during pack file copy
Allows copying of files in non-root containers
1 parent c2eda87 commit f7ba491

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

templates/_helpers.tpl

+8-11
Original file line numberDiff line numberDiff line change
@@ -350,10 +350,9 @@ Merge packs and virtualenvs from st2 with those from st2packs images
350350
- 'sh'
351351
- '-ec'
352352
- |
353-
/bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared &&
354-
/bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared
355-
{{- with .securityContext | default $.Values.st2actionrunner.securityContext | default $.Values.securityContext }}
356-
{{/* st2actionrunner is likely the most permissive so use that if defined. */}}
353+
/bin/cp -dR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared &&
354+
/bin/cp -dR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared
355+
{{- with $.Values.securityContext }}
357356
securityContext: {{- toYaml . | nindent 8 }}
358357
{{- end }}
359358
{{- end }}
@@ -372,10 +371,9 @@ Merge packs and virtualenvs from st2 with those from st2packs images
372371
- 'sh'
373372
- '-ec'
374373
- |
375-
/bin/cp -aR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared &&
376-
/bin/cp -aR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared
377-
{{- with .Values.st2actionrunner.securityContext | default .Values.securityContext }}
378-
{{/* st2actionrunner is likely the most permissive so use that if defined. */}}
374+
/bin/cp -dR /opt/stackstorm/packs/. /opt/stackstorm/packs-shared &&
375+
/bin/cp -dR /opt/stackstorm/virtualenvs/. /opt/stackstorm/virtualenvs-shared
376+
{{- with .Values.securityContext }}
379377
securityContext: {{- toYaml . | nindent 8 }}
380378
{{- end }}
381379
{{- end }}
@@ -393,9 +391,8 @@ Merge packs and virtualenvs from st2 with those from st2packs images
393391
- 'sh'
394392
- '-ec'
395393
- |
396-
/bin/cp -aR /opt/stackstorm/configs/. /opt/stackstorm/configs-shared
397-
{{- with .Values.st2actionrunner.securityContext | default .Values.securityContext }}
398-
{{/* st2actionrunner is likely the most permissive so use that if defined. */}}
394+
/bin/cp -dR /opt/stackstorm/configs/. /opt/stackstorm/configs-shared
395+
{{- with .Values.securityContext }}
399396
securityContext: {{- toYaml . | nindent 8 }}
400397
{{- end }}
401398
{{- end }}

0 commit comments

Comments
 (0)