test commit do not merge

dperny · dperny · commit e77a9e01d088 · 2021-06-24T11:49:20.000-06:00
Signed-off-by: Drew Erny &lt;derny@mirantis.com&gt;
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,7 +11,7 @@ jobs:
       # Needed to install go
       OS: linux
       ARCH: amd64
-      GOVERSION: 1.11
+      GOVERSION: 1.13
       # Needed to install protoc
       PROTOC_VERSION: 3.6.1
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,10 @@
 # NOTE(dperny): for some reason, alpine was giving me trouble
-FROM golang:1.11.0-stretch
+ARG GO_VERSION=1.13.15
+ARG DEBIAN_FRONTEND=noninteractive
+ARG BASE_DEBIAN_DISTRO="buster"
+ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}"
+
+FROM ${GOLANG_IMAGE}
 
 RUN apt-get update && apt-get install -y make git unzip
 
diff --git a/README.md b/README.md
@@ -332,3 +332,5 @@ drzndxnjz3c8iujdewzaplgr6    redis      5       redis:3.0.7    RUNNING
 ```
 
 As you can see, every Task running on `node-1` was rebalanced to either `node-2` or `node-3` by the reconciliation loop.
+
+
diff --git a/direct.mk b/direct.mk
@@ -42,7 +42,7 @@ setup: ## install dependencies
 	# install golangci-lint version 1.17.1 to ./bin/golangci-lint
 	@curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.17.1
 	@go get -u github.com/lk4d4/vndr
-	@go get -u github.com/stevvooe/protobuild
+	@cp $$(go env GOPATH)/src/github.com/docker/swarmkit/hack/protobuild $$(go env GOPATH)/bin/protobuild
 
 .PHONY: generate
 generate: protos
diff --git a/hack/protobuild b/hack/protobuild

-Original file line number
+Diff line change
 ```
 As you can see, every Task running on `node-1` was rebalanced to either `node-2` or `node-3` by the reconciliation loop.
++
++