Update Go and dependencies, fix image pull.

Author: Denys Smirnov

.github/workflows/check.yaml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19
+        go-version: 1.25
 
     - name: Test
       run: go test -v -coverprofile=coverage.txt -covermode=atomic ./...

Dockerfile

@@ -1,44 +1,47 @@
 # Base builder image with all libraries installed, including the source of the project
-FROM golang:1.12 as builder
+FROM golang:1.25-bookworm AS builder
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         libostree-dev \
         libglib2.0-dev \
-        btrfs-tools \
+        btrfs-progs \
     && apt-get clean
 
-ENV GOPATH=/go
-ENV GO111MODULE=on
-WORKDIR /go/src/github.com/bblfsh/bblfshd
+WORKDIR /bblfsh
+
+ADD go.mod ./
+ADD go.sum ./
+
+RUN go mod download
 
 ADD . .
 
 
 # Actual build image that compiles bblfshd and bblfshctl
-FROM builder as binbuild
+FROM builder AS binbuild
 
 RUN mkdir /build
 
 ARG BBLFSHD_VERSION=dev
-ARG BBLFSHD_BUILD=unknown
+ARG BBLFSHD_BUILD=undefined
 
 ENV GO_LDFLAGS="-X 'main.version=${BBLFSHD_VERSION}' -X 'main.build=${BBLFSHD_BUILD}'"
 
-RUN go build  -tags ostree --ldflags "${GO_LDFLAGS}" -o /build/bblfshd ./cmd/bblfshd/
+RUN go build  -tags ostree,containers_image_ostree --ldflags "${GO_LDFLAGS}" -o /build/bblfshd ./cmd/bblfshd/
 RUN go build --ldflags "${GO_LDFLAGS}" -o /build/bblfshctl ./cmd/bblfshctl/
 
 
 # Final image for bblfshd
-FROM debian:stretch-slim
+FROM debian:bookworm-slim
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends --no-install-suggests \
         ca-certificates \
         libostree-1-1 \
     && apt-get clean
 
-ENV TINI_VERSION v0.18.0
+ENV TINI_VERSION=v0.18.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 

cmd/bblfshd/main.go

@@ -6,14 +6,13 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	_ "net/http/pprof"
 	"os"
 	"os/signal"
 	"sync"
 	"syscall"
 	"time"
 
-	_ "net/http/pprof"
-
 	"gopkg.in/src-d/go-log.v1"
 
 	"github.com/bblfsh/bblfshd/daemon"
@@ -22,8 +21,9 @@ import (
 	cmdutil "github.com/bblfsh/sdk/v3/cmd"
 	"github.com/bblfsh/sdk/v3/driver/manifest/discovery"
 	"github.com/prometheus/client_golang/prometheus"
+	pversion2 "github.com/prometheus/client_golang/prometheus/collectors/version"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	pversion "github.com/prometheus/common/version"
+	pversion1 "github.com/prometheus/common/version"
 	jaegercfg "github.com/uber/jaeger-client-go/config"
 )
 
@@ -67,9 +67,9 @@ var (
 )
 
 func init() {
-	pversion.Version = version
-	pversion.BuildDate = build
-	prometheus.MustRegister(pversion.NewCollector("bblfshd"))
+	pversion1.Version = version
+	pversion1.BuildDate = build
+	prometheus.MustRegister(pversion2.NewCollector("bblfshd"))
 
 	cmd = flag.NewFlagSet("bblfshd", flag.ExitOnError)
 	network = cmd.String("network", "tcp", "network type: tcp, tcp4, tcp6, unix or unixpacket.")

daemon/daemon.go

@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package daemon

daemon/daemon_test.go

@@ -2,15 +2,16 @@ package daemon
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net"
 	"os"
-	"reflect"
 	"sync"
 	"testing"
 	"time"
 
+	"github.com/docker/distribution/registry/api/errcode"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"gopkg.in/bblfsh/sdk.v1/protocol"
@@ -53,7 +54,9 @@ func TestDaemon_InstallNonexistentDriver(t *testing.T) {
 
 	err := s.InstallDriver("", "docker://list", false)
 	require.Error(err, "An error was expected")
-	require.Equal("errcode.Errors", reflect.TypeOf(err).String())
+	var e errcode.Errors
+	ok := errors.As(err, &e)
+	require.True(ok)
 }
 
 func TestDaemonParse_MockedDriverParallelClients(t *testing.T) {

daemon/driver.go

@@ -1,3 +1,4 @@
+//go:build linux && cgo
 // +build linux,cgo
 
 package daemon
@@ -15,7 +16,6 @@ import (
 
 	"github.com/bblfsh/bblfshd/daemon/protocol"
 	"github.com/bblfsh/bblfshd/runtime"
-
 	protocol2 "github.com/bblfsh/sdk/v3/protocol"
 	"github.com/opencontainers/runc/libcontainer/configs"
 	"google.golang.org/grpc"
@@ -86,11 +86,15 @@ func NewDriverInstance(r *runtime.Runtime, lang string, i runtime.DriverImage, o
 			Destination: "/tmp/",
 			Device:      "bind",
 			Flags:       syscall.MS_BIND | syscall.MS_REC | syscall.MS_NOSUID,
-			PremountCmds: []configs.Command{
-				{Path: "mkdir", Args: []string{"-p", tmp}},
-			},
 		})
-
+		if cfg.Hooks == nil {
+			cfg.Hooks = make(configs.Hooks)
+		}
+		const hook = configs.CreateRuntime // TODO: is it the right one?
+		cfg.Hooks[hook] = append(cfg.Hooks[hook], configs.NewCommandHook(&configs.Command{
+			Path: "mkdir",
+			Args: []string{"-p", tmp},
+		}))
 		return cfg
 	}
 

go.mod

@@ -1,44 +1,121 @@
 module github.com/bblfsh/bblfshd
 
-go 1.12
+go 1.25.0
 
 require (
-	github.com/14rcole/gopopulate v0.0.0-20180821133914-b175b219e774 // indirect
 	github.com/bblfsh/go-client/v4 v4.0.1
 	github.com/bblfsh/sdk/v3 v3.3.1
 	github.com/briandowns/spinner v0.0.0-20170614154858-48dbb65d7bd5
 	github.com/cenkalti/backoff v2.1.1+incompatible
-	github.com/containers/image v3.0.0+incompatible
-	github.com/containers/storage v1.28.1 // indirect
-	github.com/docker/distribution v2.8.2+incompatible
-	github.com/docker/docker v20.10.24+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.6.0 // indirect
-	github.com/docker/go-units v0.4.0
-	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
+	github.com/containers/image v3.0.3-0.20190807230338-8645d022d4f3+incompatible
+	github.com/docker/distribution v2.8.3+incompatible
+	github.com/docker/go-units v0.5.0
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang/protobuf v1.5.0
-	github.com/google/go-github v17.0.0+incompatible // indirect
+	github.com/golang/protobuf v1.5.4
 	github.com/jessevdk/go-flags v1.4.0
-	github.com/klauspost/compress v1.16.0 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/oklog/ulid v1.3.1
 	github.com/olekukonko/tablewriter v0.0.0-20170925234030-a7a4c189eb47
-	github.com/opencontainers/image-spec v1.0.2
-	github.com/opencontainers/runc v1.1.5
+	github.com/opencontainers/image-spec v1.1.0
+	github.com/opencontainers/runc v1.4.0
 	github.com/opentracing/opentracing-go v1.1.0
-	github.com/ostreedev/ostree-go v0.0.0-20170727130318-80ab7dbb8986 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.11.1
-	github.com/prometheus/common v0.26.0
+	github.com/prometheus/client_golang v1.20.5
+	github.com/prometheus/common v0.55.0
 	github.com/src-d/enry/v2 v2.0.0
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.11.1
 	github.com/uber/jaeger-client-go v2.16.0+incompatible
-	github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
-	github.com/ulikunitz/xz v0.5.11 // indirect
-	github.com/vbatts/tar-split v0.11.2 // indirect
-	golang.org/x/net v0.7.0
-	google.golang.org/grpc v1.30.0
+	golang.org/x/net v0.50.0
+	google.golang.org/grpc v1.79.1
 	gopkg.in/bblfsh/sdk.v1 v1.17.0
 	gopkg.in/src-d/go-errors.v1 v1.0.0
 	gopkg.in/src-d/go-log.v1 v1.0.2
 )
+
+require (
+	cyphar.com/go-pathrs v0.2.3 // indirect
+	github.com/14rcole/gopopulate v0.0.0-20180821133914-b175b219e774 // indirect
+	github.com/BurntSushi/toml v1.6.0 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver v3.5.1+incompatible // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/checkpoint-restore/go-criu/v7 v7.2.0 // indirect
+	github.com/containerd/console v1.0.5 // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/containers/storage v1.59.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.7.0 // indirect
+	github.com/cyphar/filepath-securejoin v0.6.1 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/docker v27.3.1+incompatible // indirect
+	github.com/docker/docker-credential-helpers v0.7.0 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-metrics v0.0.1 // indirect
+	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
+	github.com/fatih/color v1.15.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/godbus/dbus/v5 v5.2.2 // indirect
+	github.com/google/go-github v17.0.0+incompatible // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
+	github.com/klauspost/compress v1.18.4 // indirect
+	github.com/klauspost/pgzip v1.2.6 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/mattn/go-runewidth v0.0.2 // indirect
+	github.com/mcuadros/go-lookup v0.0.0-20171110082742-5650f26be767 // indirect
+	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/sys/capability v0.4.0 // indirect
+	github.com/moby/sys/mountinfo v0.7.2 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
+	github.com/moby/sys/userns v0.1.0 // indirect
+	github.com/moby/term v0.5.2 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/mrunalp/fileutils v0.5.1 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/opencontainers/cgroups v0.0.6 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/runtime-spec v1.3.0 // indirect
+	github.com/opencontainers/selinux v1.13.1 // indirect
+	github.com/ostreedev/ostree-go v0.0.0-20170727130318-80ab7dbb8986 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/rogpeppe/go-internal v1.14.1 // indirect
+	github.com/seccomp/libseccomp-golang v0.11.1 // indirect
+	github.com/sirupsen/logrus v1.9.4 // indirect
+	github.com/src-d/envconfig v1.0.0 // indirect
+	github.com/src-d/go-oniguruma v1.1.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/toqueteos/trie v1.0.0 // indirect
+	github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
+	github.com/ulikunitz/xz v0.5.15 // indirect
+	github.com/vbatts/tar-split v0.12.2 // indirect
+	github.com/vishvananda/netlink v1.3.1 // indirect
+	github.com/vishvananda/netns v0.0.5 // indirect
+	github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
+	go.opentelemetry.io/otel v1.40.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.40.0 // indirect
+	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/trace v1.40.0 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/mod v0.32.0 // indirect
+	golang.org/x/oauth2 v0.34.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
+	golang.org/x/term v0.40.0 // indirect
+	golang.org/x/text v0.34.0 // indirect
+	golang.org/x/time v0.14.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect
+	google.golang.org/protobuf v1.36.11 // indirect
+	gopkg.in/toqueteos/substring.v1 v1.0.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)