From 14510a5e77588e80d8045db423e40cea5bb1ceca Mon Sep 17 00:00:00 2001
From: Stefan VanBuren <svanburen@buf.build>
Date: Tue, 7 Jan 2025 17:31:12 -0500
Subject: [PATCH] Run `make copyfrommakego` and drop Dockerfile.workspace

For context, see https://github.com/bufbuild/makego/pull/173.
---
 Dockerfile.workspace         | 36 ------------------------------------
 make/go/dep_buf.mk           |  4 ++--
 make/go/dep_golangci_lint.mk |  4 ++--
 make/go/docker.mk            | 21 ---------------------
 4 files changed, 4 insertions(+), 61 deletions(-)
 delete mode 100644 Dockerfile.workspace

diff --git a/Dockerfile.workspace b/Dockerfile.workspace
deleted file mode 100644
index a99b11cd46..0000000000
--- a/Dockerfile.workspace
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM golang:1.23-alpine3.21
-
-ARG PROJECT
-ARG GO_MODULE
-
-ENV \
-  CACHE_BASE=/cache/$PROJECT \
-  GO111MODULE=on \
-  GOPRIVATE=$GO_MODULE \
-  GOPATH=/cache/$PROJECT/Linux/x86_64/go \
-  GOBIN=/cache/$PROJECT/Linux/x86_64/gobin \
-  PATH=/cache/$PROJECT/Linux/x86_64/gobin:/cache/$PROJECT/Linux/x86_64/bin:${PATH}
-
-WORKDIR /workspace
-
-RUN apk add --update --no-cache \
-    bash \
-    build-base \
-    ca-certificates \
-    curl \
-    git \
-    openssh-client \
-    unzip \
-    wget && \
-  rm -rf /var/cache/apk/*
-
-RUN wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-  wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r1/glibc-2.35-r1.apk && \
-  apk add --no-cache glibc-2.35-r1.apk && \
-  rm -rf /var/cache/apk/*
-
-COPY go.mod go.sum /workspace/
-RUN go mod download
-COPY make /workspace/make
-COPY Makefile /workspace/
-RUN make dockerdeps
diff --git a/make/go/dep_buf.mk b/make/go/dep_buf.mk
index 74d69250b5..c40a0c287c 100644
--- a/make/go/dep_buf.mk
+++ b/make/go/dep_buf.mk
@@ -7,8 +7,8 @@ $(call _assert_var,CACHE_VERSIONS)
 $(call _assert_var,CACHE_BIN)
 
 # Settable
-# https://github.com/bufbuild/buf/releases 20241219 checked 20241219
-BUF_VERSION ?= v1.48.0
+# https://github.com/bufbuild/buf/releases 20250107 checked 20250107
+BUF_VERSION ?= v1.49.0
 # Settable
 #
 # If set, this path will be installed every time someone depends on $(BUF)
diff --git a/make/go/dep_golangci_lint.mk b/make/go/dep_golangci_lint.mk
index 8babad9470..a33a9929d8 100644
--- a/make/go/dep_golangci_lint.mk
+++ b/make/go/dep_golangci_lint.mk
@@ -11,9 +11,9 @@ $(call _assert_var,CACHE_BIN)
 GOLANGCI_LINT_GO_VERSION := $(shell go list -m -f '{{.GoVersion}}' | cut -d'.' -f1-2)
 
 # Settable
-# https://github.com/golangci/golangci-lint/releases 20241110 checked 20241113
+# https://github.com/golangci/golangci-lint/releases 20250102 checked 20250102
 # Contrast golangci-lint configuration with the one in https://github.com/connectrpc/connect-go/blob/main/.golangci.yml when upgrading
-GOLANGCI_LINT_VERSION ?= v1.62.0
+GOLANGCI_LINT_VERSION ?= v1.63.2
 
 GOLANGCI_LINT := $(CACHE_VERSIONS)/golangci-lint/$(GOLANGCI_LINT_VERSION)-go$(GOLANGCI_LINT_GO_VERSION)
 $(GOLANGCI_LINT):
diff --git a/make/go/docker.mk b/make/go/docker.mk
index 8155706e7a..8f02f8be3b 100644
--- a/make/go/docker.mk
+++ b/make/go/docker.mk
@@ -12,32 +12,11 @@ $(call _assert_var,DOCKER_ORG)
 # Must be set
 $(call _assert_var,DOCKER_PROJECT)
 
-DOCKER_WORKSPACE_IMAGE := $(DOCKER_ORG)/$(DOCKER_PROJECT)-workspace
-DOCKER_WORKSPACE_FILE := Dockerfile.workspace
-DOCKER_WORKSPACE_DIR := /workspace
-
 # Settable
 DOCKER_BINS ?=
 # Settable
 DOCKER_BUILD_EXTRA_FLAGS ?=
 
-# Runtime
-DOCKERMAKETARGET ?= all
-
-.PHONY: dockerbuildworkspace
-dockerbuildworkspace:
-	docker build \
-		$(DOCKER_BUILD_EXTRA_FLAGS) \
-		--build-arg PROJECT=$(PROJECT) \
-		--build-arg GO_MODULE=$(GO_MODULE) \
-		-t $(DOCKER_WORKSPACE_IMAGE) \
-		-f $(DOCKER_WORKSPACE_FILE) \
-		.
-
-.PHONY: dockermakeworkspace
-dockermakeworkspace: dockerbuildworkspace
-	docker run -v "$(CURDIR):$(DOCKER_WORKSPACE_DIR)" $(DOCKER_WORKSPACE_IMAGE) make -j 8 $(DOCKERMAKETARGET)
-
 .PHONY: dockerbuild
 dockerbuild::