[arvados] updated: 2.7.0-6660-g3b59c03018

[git repository hosting]

Summary of changes:
 cmd/arvados-package/build.go  | 6 +++---
 lib/crunchrun/docker.go       | 9 ++++-----
 sdk/go/arvadostest/metrics.go | 2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

       via  3b59c03018a67fc16675bbadfd6df843c52256d4 (commit)
       via  d0dfa9e88b216fafde1a22ff9939e003350dd3cd (commit)
      from  b3b0f3229be6a54d8fec509aba7b226b97f63cb2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 3b59c03018a67fc16675bbadfd6df843c52256d4
Author: Tom Clegg <tom at curii.com>
Date:   Thu May 30 23:18:06 2024 -0400

    21705: Update prometheus library usage.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/sdk/go/arvadostest/metrics.go b/sdk/go/arvadostest/metrics.go
index 5fe1d607bf..94bf3d131f 100644
--- a/sdk/go/arvadostest/metrics.go
+++ b/sdk/go/arvadostest/metrics.go
@@ -13,7 +13,7 @@ import (
 
 func GatherMetricsAsString(reg *prometheus.Registry) string {
 	buf := bytes.NewBuffer(nil)
-	enc := expfmt.NewEncoder(buf, expfmt.FmtText)
+	enc := expfmt.NewEncoder(buf, expfmt.NewFormat(expfmt.TypeTextPlain))
 	got, _ := reg.Gather()
 	for _, mf := range got {
 		enc.Encode(mf)

commit d0dfa9e88b216fafde1a22ff9939e003350dd3cd
Author: Tom Clegg <tom at curii.com>
Date:   Thu May 30 23:17:52 2024 -0400

    21705: Update docker library usage.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index 2ce8a67432..fe076b8f59 100644
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -18,7 +18,7 @@ import (
 
 	"git.arvados.org/arvados.git/lib/crunchrun"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
-	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/client"
 )
 
@@ -149,14 +149,14 @@ func dockerRm(ctx context.Context, name string) error {
 	if err != nil {
 		return err
 	}
-	ctrs, err := cli.ContainerList(ctx, types.ContainerListOptions{All: true, Limit: -1})
+	ctrs, err := cli.ContainerList(ctx, container.ListOptions{All: true, Limit: -1})
 	if err != nil {
 		return err
 	}
 	for _, ctr := range ctrs {
 		for _, ctrname := range ctr.Names {
 			if ctrname == "/"+name {
-				err = cli.ContainerRemove(ctx, ctr.ID, types.ContainerRemoveOptions{})
+				err = cli.ContainerRemove(ctx, ctr.ID, container.RemoveOptions{})
 				if err != nil {
 					return fmt.Errorf("error removing container %s: %w", ctr.ID, err)
 				}
diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go
index 4f449133f3..e3f5c30a31 100644
--- a/lib/crunchrun/docker.go
+++ b/lib/crunchrun/docker.go
@@ -15,7 +15,6 @@ import (
 	"time"
 
 	"git.arvados.org/arvados.git/sdk/go/arvados"
-	dockertypes "github.com/docker/docker/api/types"
 	dockercontainer "github.com/docker/docker/api/types/container"
 	dockerclient "github.com/docker/docker/client"
 )
@@ -207,11 +206,11 @@ func (e *dockerExecutor) Pid() int {
 }
 
 func (e *dockerExecutor) Start() error {
-	return e.dockerclient.ContainerStart(context.TODO(), e.containerID, dockertypes.ContainerStartOptions{})
+	return e.dockerclient.ContainerStart(context.TODO(), e.containerID, dockercontainer.StartOptions{})
 }
 
 func (e *dockerExecutor) Stop() error {
-	err := e.dockerclient.ContainerRemove(context.TODO(), e.containerID, dockertypes.ContainerRemoveOptions{Force: true})
+	err := e.dockerclient.ContainerRemove(context.TODO(), e.containerID, dockercontainer.RemoveOptions{Force: true})
 	if err != nil && strings.Contains(err.Error(), "No such container: "+e.containerID) {
 		err = nil
 	}
@@ -277,7 +276,7 @@ func (e *dockerExecutor) Wait(ctx context.Context) (int, error) {
 }
 
 func (e *dockerExecutor) startIO(stdin io.Reader, stdout, stderr io.Writer) error {
-	resp, err := e.dockerclient.ContainerAttach(context.TODO(), e.containerID, dockertypes.ContainerAttachOptions{
+	resp, err := e.dockerclient.ContainerAttach(context.TODO(), e.containerID, dockercontainer.AttachOptions{
 		Stream: true,
 		Stdin:  stdin != nil,
 		Stdout: true,
@@ -340,7 +339,7 @@ func (e *dockerExecutor) handleStdoutStderr(stdout, stderr io.Writer, reader io.
 }
 
 func (e *dockerExecutor) Close() {
-	e.dockerclient.ContainerRemove(context.TODO(), e.containerID, dockertypes.ContainerRemoveOptions{Force: true})
+	e.dockerclient.ContainerRemove(context.TODO(), e.containerID, dockercontainer.RemoveOptions{Force: true})
 }
 
 func (e *dockerExecutor) InjectCommand(ctx context.Context, detachKeys, username string, usingTTY bool, injectcmd []string) (*exec.Cmd, error) {

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


hooks/post-receive
--