Merging upstream version 20210727.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 151 insertions, 11 deletions

diff --git a/share/bash-completion/container b/share/bash-completion/container
index bb3eb41..dfb7ad5 100644
--- a/share/bash-completion/container
+++ b/share/bash-completion/container
@@ -334,6 +334,22 @@ _container()
 			return 0
 			;;
 
+		update|u)
+			case "${prev}" in
+				-n|--name)
+					opts="$(container list -s -f shell)"
+					COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+					return 0
+					;;
+
+				*)
+					opts="-n --name -y --yes"
+					COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+					return 0
+					;;
+			esac
+			;;
+
 		version|ver)
 			return 0
 			;;
diff --git a/share/hooks/post-start.chown-nvidia.sh b/share/hooks/post-start.chown-nvidia.sh
index 64c02cc..2a99bd3 100755
--- a/share/hooks/post-start.chown-nvidia.sh
+++ b/share/hooks/post-start.chown-nvidia.sh
@@ -19,6 +19,10 @@
 
 set -e
 
+PROJECT="open-infrastructure"
+SOFTWARE="compute-tools"
+PROGRAM="container"
+
 CONTAINER="/var/lib/machines"
 
 if grep -qs nvidia "${CONTAINER}/${NAME}/etc/group"
diff --git a/share/hooks/pre-build.git-pull.sh b/share/hooks/pre-build.git-pull.sh
index 744f955..d2cc152 100755
--- a/share/hooks/pre-build.git-pull.sh
+++ b/share/hooks/pre-build.git-pull.sh
@@ -31,10 +31,13 @@ do
 	then
 		echo "Updating ${DIRECTORY}..."
 
-		if [ -e "/etc/${SOFTWARE}.conf" ]
-		then
-			. "/etc/${SOFTWARE}.conf"
-		fi
+		for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf
+		do
+			if [ -e "${FILE}" ]
+			then
+				. "${FILE}"
+			fi
+		done
 
 		DEBCONF_ID="${DEBCONF_ID:-HEAD}"
 
diff --git a/share/hooks/pre-get.git-pull.sh b/share/hooks/pre-get.git-pull.sh
index 744f955..d2cc152 100755
--- a/share/hooks/pre-get.git-pull.sh
+++ b/share/hooks/pre-get.git-pull.sh
@@ -31,10 +31,13 @@ do
 	then
 		echo "Updating ${DIRECTORY}..."
 
-		if [ -e "/etc/${SOFTWARE}.conf" ]
-		then
-			. "/etc/${SOFTWARE}.conf"
-		fi
+		for FILE in "/etc/${SOFTWARE}/${PROGRAM}.conf" "/etc/${SOFTWARE}/${PROGRAM}.conf.d"/*.conf
+		do
+			if [ -e "${FILE}" ]
+			then
+				. "${FILE}"
+			fi
+		done
 
 		DEBCONF_ID="${DEBCONF_ID:-HEAD}"
 
diff --git a/share/keys/daniel.baumann@open-infrastructure.net.pub b/share/keys/daniel.baumann@open-infrastructure.net_0xB62C61A10B93195F.pub
index 1e1884d..1e1884d 100644
--- a/share/keys/daniel.baumann@open-infrastructure.net.pub
+++ b/share/keys/daniel.baumann@open-infrastructure.net_0xB62C61A10B93195F.pub
diff --git a/share/keys/daniel@debian.org.pub b/share/keys/daniel@debian.org_0x55CF1BF986ABB9C7.pub
index 910f870..910f870 100644
--- a/share/keys/daniel@debian.org.pub
+++ b/share/keys/daniel@debian.org_0x55CF1BF986ABB9C7.pub
diff --git a/share/man/container-run.1.rst b/share/man/container-run.1.rst
index 890c95d..9759811 100644
--- a/share/man/container-run.1.rst
+++ b/share/man/container-run.1.rst
@@ -31,8 +31,8 @@ Execute commands in a container namespace
 Synopsis
 ========
 
-| **container run** ['OPTIONS']
-| **cnt r** ['OPTIONS']
+| **container run** ['OPTIONS'] -- 'COMMAND'\|"COMMANDS"
+| **cnt r** ['OPTIONS'] -- 'COMMAND'\|"COMMANDS"
 
 Description
 ===========
diff --git a/share/man/container-update.1.rst b/share/man/container-update.1.rst
new file mode 100644
index 0000000..7b17ae2
--- /dev/null
+++ b/share/man/container-update.1.rst
@@ -0,0 +1,111 @@
+.. Open Infrastructure: compute-tools
+
+.. Copyright (C) 2014-2021 Daniel Baumann <daniel.baumann@open-infrastructure.net>
+..
+.. SPDX-License-Identifier: GPL-3.0+
+..
+.. This program is free software: you can redistribute it and/or modify
+.. it under the terms of the GNU General Public License as published by
+.. the Free Software Foundation, either version 3 of the License, or
+.. (at your option) any later version.
+..
+.. This program is distributed in the hope that it will be useful,
+.. but WITHOUT ANY WARRANTY; without even the implied warranty of
+.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.. GNU General Public License for more details.
+..
+.. You should have received a copy of the GNU General Public License
+.. along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+================
+container-update
+================
+
+--------------------------------------------
+Update the packages installed in a container
+--------------------------------------------
+
+:manual section: 1
+:manual group: Open Infrastructure
+
+Synopsis
+========
+
+| **container update** ['OPTIONS']
+| **cnt u** ['OPTIONS']
+
+Description
+===========
+
+The **container update** command updates packages installed in a container.
+
+Options
+=======
+
+The following **container update** options are available:
+
+-n, --name='NAME':
+  Specify container name. Specifying 'ALL' will start all stopped container.
+
+-f, --full-upgrade:
+  Runs an additional 'apt full-upgrade' after 'apt upgrade'.
+
+-r, --autoremove:
+  Runs an additional 'apt autoremove' after 'apt upgrade'.
+
+-p, --purge:
+  Passing '--purge' to 'apt autoremove'.
+
+-y|--yes:
+  Passing 'yes' to all questions asked by the package manager.
+
+Examples
+========
+
+Update example.net container (apt update && apt upgrade):
+
+  sudo container update -n example.net
+
+Update example.net container without asking questions (apt update && apt --yes
+upgrade):
+
+  sudo container update -n example.net -y
+
+Full update of example.net container without asking questions (apt update &&
+apt --yes upgrade && apt --yes full-upgrade):
+
+  sudo container update -n example.net -f -y
+
+Full update of all container on the host, with asking questions and
+purging unused packages (apt update && apt upgrade && apt full-upgrade && apt
+autoremove):
+
+  sudo container update -n ALL -f -r -p -y
+
+See also
+========
+
+| compute-tools(7),
+| container(1).
+
+Homepage
+========
+
+More information about compute-tools and the Open Infrastructure project can be
+found on the homepage (https://open-infrastructure.net).
+
+Contact
+=======
+
+Bug reports, feature requests, help, patches, support and everything else are
+welcome on the Open Infrastructure Software Mailing List
+<software@lists.open-infrastructure.net>.
+
+Debian specific bugs can also be reported in the Debian Bug Tracking System
+(https://bugs.debian.org).
+
+Authors
+=======
+
+compute-tools were written by Daniel Baumann
+<daniel.baumann@open-infrastructure.net> and others.
diff --git a/share/man/container.1.rst b/share/man/container.1.rst
index cce283b..3fff87b 100644
--- a/share/man/container.1.rst
+++ b/share/man/container.1.rst
@@ -101,6 +101,9 @@ status:
 top:
   Dynamic list of container on the system, see container-top(1).
 
+update:
+  Update the packages installed in a container.
+
 version:
   Show container version, see container-version(1).
 
@@ -109,7 +112,7 @@ Files
 
 The following files are used:
 
-/etc/compute-tools/container:
+/etc/compute-tools/container.conf, /etc/compute-tools/container.conf.d/\*.conf:
   Container configuration files.
 
 /usr/bin/container, /usr/bin/cnt: