consolidate docker image commands for prereqs

mocaccinoOS · Aug 2, 2023 · 8c50ebf · 8c50ebf
1 parent b265b02
commit 8c50ebf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/templates/build.yaml b/packages/templates/build.yaml
@@ -39,7 +39,7 @@ prelude:
 
 {{ $prereqs := include "cr.prereqs" ( list .Values $packages "" ) }}
 - |
-{{ ( include "cr.merge_shell_commands" $prereqs ) | toYaml | indent 2 }}
+{{ ( include "cr.merge_shell_commands" $prereqs ) | indent 2 }}
 
 {{ if eq .Values.category "layerbase" }}
 - |

diff --git a/packages/templates/functions.yaml b/packages/templates/functions.yaml
@@ -454,7 +454,7 @@
 {{- range ( get ( ( printf "list:\n %s" . ) | fromYaml ) "list" ) }}
 {{- $command = printf "%s\n%s; \\" $command ( trimAll "; \n" . ) }}
 {{- end }}
-{{- $command = printf "%s\necho;" $command }}
+{{- $command = printf "%s\necho;" $command | trimPrefix "\n" }}
 
 {{- $command }}