From 5efee8c6bb548138cfb63a24ed7c7747d366486a Mon Sep 17 00:00:00 2001
From: Dominic Ricottone <me@dominic-ricottone.com>
Date: Thu, 28 Mar 2024 15:23:29 -0500
Subject: [PATCH] Update

Cleaned up the Makefile recipes.

Updated everything for new versions of libraries.
---
 Makefile  | 20 +++++++++++++++-----
 docker.go |  7 +++----
 go.mod    | 28 +++++++++++++++-------------
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index bee0d50..ccc488f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,23 @@
-simple-builder:
-	go get -u
+go.mod:
+	go mod init git.dominic-ricottone.com/~dricottone/simple-builder
+	go get github.com/docker/docker/client
+	go get github.com/docker/docker/api/types/container
+	go get github.com/docker/docker/api/types/mount
+	go get github.com/opencontainers/image-spec/specs-go/v1
+
+simple-builder: go.mod *.go
 	go build .
 
+build: simple-builder
+
 clean:
-	rm --force go.sum moby-demo
-	rm --force --recursive dir1 dir2
+	rm -f go.mod go.sum simple-builder
+
+uninstall:
+	rm -f ~/.local/bin/simple-builder
 
 PWD=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 install:
 	ln -s $(PWD)simple-builder ~/.local/bin/simple-builder
 
-.PHONY: clean install
+.PHONY: build clean install
diff --git a/docker.go b/docker.go
index 5181c65..93b152d 100644
--- a/docker.go
+++ b/docker.go
@@ -8,7 +8,6 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/docker/client"
@@ -55,7 +54,7 @@ func build_package(pkg Package, srcdir, pkgdir, arch string) error {
 		return err
 	}
 
-	start_opts := types.ContainerStartOptions{}
+	start_opts := container.StartOptions{}
 
 	cli.ContainerStart(ctx, con.ID, start_opts)
 
@@ -64,7 +63,7 @@ func build_package(pkg Package, srcdir, pkgdir, arch string) error {
 		return err
 	}
 
-	rm_opts := types.ContainerRemoveOptions{
+	rm_opts := container.RemoveOptions{
 		Force: true,
 	}
 
@@ -101,7 +100,7 @@ func check_result(cli *client.Client, ctx context.Context, id string) error {
 
 // Dump logs from a build.
 func dump_logs(cli *client.Client, ctx context.Context, id string) {
-	conf := types.ContainerLogsOptions{
+	conf := container.LogsOptions{
 		ShowStdout: true,
 	}
 
diff --git a/go.mod b/go.mod
index dcfde32..0632c6f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,22 +1,24 @@
 module git.dominic-ricottone.com/~dricottone/simple-builder
 
-go 1.20
+go 1.22.1
 
 require (
-	github.com/docker/docker v24.0.2+incompatible
-	github.com/opencontainers/image-spec v1.0.2
-)
-
-require (
-	github.com/Microsoft/go-winio v0.6.1 // indirect
-	github.com/docker/distribution v2.8.2+incompatible // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/Microsoft/go-winio v0.4.14 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/docker v26.0.0+incompatible // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/tools v0.9.3 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+	go.opentelemetry.io/otel v1.24.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	golang.org/x/sys v0.1.0 // indirect
 )
-- 
2.45.2