Skip to content

Commit

Permalink
test commit do not merge
Browse files Browse the repository at this point in the history
Signed-off-by: Drew Erny <derny@mirantis.com>
  • Loading branch information
dperny committed Jun 24, 2021
1 parent 0b8364e commit e77a9e0
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.


2 changes: 1 addition & 1 deletion direct.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added hack/protobuild
Binary file not shown.

0 comments on commit e77a9e0

Please sign in to comment.