[arvados] created: 2.7.0-5003-g621cd0a2fc

[git repository hosting]

        at  621cd0a2fc6dd8c1b63eeb687b4c4b7efb130f14 (commit)


commit 621cd0a2fc6dd8c1b63eeb687b4c4b7efb130f14
Author: Tom Clegg <tom at curii.com>
Date:   Tue Oct 17 14:54:57 2023 -0400

    21055: Add debian 12 codename to fix docker install.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 81b2fad921..c4f104f30a 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -240,6 +240,8 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 				codename = "buster"
 			case 11:
 				codename = "bullseye"
+			case 12:
+				codename = "bookworm"
 			default:
 				err = fmt.Errorf("don't know how to install docker-ce for debian %d", osv.Major)
 				return 1

commit 91492fc934a2ce4c265efc338823a36bf871df38
Author: Tom Clegg <tom at curii.com>
Date:   Tue Oct 17 14:54:32 2023 -0400

    21055: Fix unreported error due to shadowed err variable.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 9078ef7782..81b2fad921 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -231,7 +231,7 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 	}
 
 	if dev || test {
-		if havedockerversion, err := exec.Command("docker", "--version").CombinedOutput(); err == nil {
+		if havedockerversion, err2 := exec.Command("docker", "--version").CombinedOutput(); err2 == nil {
 			logger.Printf("%s installed, assuming that version is ok", bytes.TrimSuffix(havedockerversion, []byte("\n")))
 		} else if osv.Debian {
 			var codename string

commit a754365302a9066f5ed4f27b743dd93507fe2059
Author: Tom Clegg <tom at curii.com>
Date:   Tue Oct 17 14:20:34 2023 -0400

    21055: Fix sysctl usage to accommodate running in docker container.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index ac3c466cb0..9078ef7782 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -261,16 +261,18 @@ DEBIAN_FRONTEND=noninteractive apt-get --yes --no-install-recommends install doc
 		}
 
 		err = inst.runBash(`
-add="fs.inotify.max_user_watches=524288"
-if ! grep -F -- "$add" /etc/sysctl.conf; then
-    echo "$add" | tee -a /etc/sysctl.conf
+key=fs.inotify.max_user_watches
+min=524288
+if [[ "$(sysctl --values "${key}")" -lt "${min}" ]]; then
+    sysctl "${key}=${min}"
+    # writing sysctl worked, so we should make it permanent
+    echo "${key}=${min}" | tee -a /etc/sysctl.conf
     sysctl -p
 fi
 `, stdout, stderr)
 		if err != nil {
-			// Just warn instead of fail because this is expected when running
-			// inside Docker.
-			logger.Warnf("couldn't set fs.inotify.max_user_watches value: %v", err)
+			err = fmt.Errorf("couldn't set fs.inotify.max_user_watches value. (Is this a docker container? Fix this on the docker host by adding fs.inotify.max_user_watches=524288 to /etc/sysctl.conf and running `sysctl -p`)")
+			return 1
 		}
 	}
 

-----------------------------------------------------------------------


hooks/post-receive
--