templates: do not set root password if empty

Signed-off-by: Adphi <[email protected]>
linka-cloud · Sep 11, 2022 · 238d9a5 · 238d9a5
1 parent bf88399
commit 238d9a5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/templates/alpine.Dockerfile b/templates/alpine.Dockerfile
@@ -12,7 +12,7 @@ RUN apk update --no-cache && \
 RUN for s in bootmisc hostname hwclock modules networking swap sysctl urandom syslog; do rc-update add $s boot; done
 RUN for s in devfs dmesg hwdrivers mdev; do rc-update add $s sysinit; done
 
-RUN echo "root:{{- if .Password}}{{ .Password}}{{- else}}root{{- end}}" | chpasswd
+{{ if .Password }}RUN echo "root:{{ .Password }}" | chpasswd {{ end }}
 
 {{ if eq .NetworkManager "ifupdown"}}
 RUN apk add --no-cache ifupdown-ng

diff --git a/templates/centos.Dockerfile b/templates/centos.Dockerfile
@@ -17,4 +17,4 @@ RUN dracut --no-hostonly --regenerate-all --force && \
     ln -s $(find . -name 'vmlinuz-*') vmlinuz && \
     ln -s $(find . -name 'initramfs-*.img') initrd.img
 
-RUN echo "root:{{- if .Password}}{{ .Password}}{{- else}}root{{- end}}" | chpasswd
+{{ if .Password }}RUN echo "root:{{ .Password }}" | chpasswd {{ end }}
diff --git a/templates/debian.Dockerfile b/templates/debian.Dockerfile
@@ -16,7 +16,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
 
 RUN systemctl preset-all
 
-RUN echo "root:{{- if .Password}}{{ .Password}}{{- else}}root{{- end}}" | chpasswd
+{{ if .Password }}RUN echo "root:{{ .Password }}" | chpasswd {{ end }}
 
 {{ if eq .NetworkManager "netplan" }}
 RUN apt install -y netplan.io

diff --git a/templates/ubuntu.Dockerfile b/templates/ubuntu.Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update -y && \
 
 RUN systemctl preset-all
 
-RUN echo "root:{{- if .Password}}{{ .Password}}{{- else}}root{{- end}}" | chpasswd
+{{ if .Password }}RUN echo "root:{{ .Password }}" | chpasswd {{ end }}
 
 {{ if eq .NetworkManager "netplan" }}
 RUN apt install -y netplan.io