airship
/
divingbell
Code Issues Proposed changes

Merge "Update dpkg commands to be non-interactive"

This commit is contained in:
Zuul 2020-03-20 20:37:00 +00:00 committed by Gerrit Code Review
parent f0eb0b7582 b98efc4f29
commit db4f382b59
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
divingbell/templates/bin/_apt.sh.tpl
View File

@ -111,7 +111,7 @@ DEBIAN_FRONTEND=noninteractive apt-get update
{{- end }} {{- end }}
# Run dpkg in case of interruption of previous dpkg operation # Run dpkg in case of interruption of previous dpkg operation
dpkg --configure -a dpkg --configure -a --force-confold,confdef
# Perform package installs # Perform package installs
set +x set +x
@ -192,7 +192,7 @@ if [ -f ${persist_path}/packages ]; then
TO_KEEP=$(echo "$TO_DELETE" | comm -23 ${persist_path}/packages -) TO_KEEP=$(echo "$TO_DELETE" | comm -23 ${persist_path}/packages -)
{{- end }} {{- end }}
if [ ! -z "$TO_DELETE" ]; then if [ ! -z "$TO_DELETE" ]; then
dpkg --configure -a dpkg --configure -a --force-confold,confdef
{{- if hasKey .Values.conf.apt "whitelistpkgs" }} {{- if hasKey .Values.conf.apt "whitelistpkgs" }}
WHITELIST=({{ include "helm-toolkit.utils.joinListWithSpace" .Values.conf.apt.whitelistpkgs }}) WHITELIST=({{ include "helm-toolkit.utils.joinListWithSpace" .Values.conf.apt.whitelistpkgs }})
@ -236,7 +236,7 @@ fi
###################################################### ######################################################
{{- if hasKey .Values.conf.apt "blacklistpkgs" }} {{- if hasKey .Values.conf.apt "blacklistpkgs" }}
dpkg --configure -a dpkg --configure -a --force-confold,confdef
{{- range .Values.conf.apt.blacklistpkgs }} {{- range .Values.conf.apt.blacklistpkgs }}
{{- $package := . }} {{- $package := . }}
DEBIAN_FRONTEND=noninteractive $APT_PURGE {{ $package | squote }} DEBIAN_FRONTEND=noninteractive $APT_PURGE {{ $package | squote }}