Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dust this off, update to Go 1.14, and get tests passing again #171

Merged
merged 7 commits into from
Mar 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ matrix:
allow_failures:
- go: tip
go:
- 1.8.3
- tip
- 1.14.1
script:
- make test
after_success:
Expand Down
261 changes: 0 additions & 261 deletions Godeps/Godeps.json

This file was deleted.

5 changes: 0 additions & 5 deletions Godeps/Readme

This file was deleted.

16 changes: 7 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ BATS_INSTALL_DIR ?= $(PWD)/_testing/bats

BATS_OUT_FORMAT=$(shell bash -c "echo $${CI+--tap}")
GOPATH := $(shell echo $${GOPATH%%:*})
GO111MODULE := off

# go build args
GO_TAG_ARGS ?= -tags netgo

export GOPATH
export GO111MODULE

.PHONY: all
all: binclean clean build test
Expand Down Expand Up @@ -77,9 +79,12 @@ test:
@DOCKER_BUILDER_TEST_MODE=1 $(MAKE) .test

.PHONY: fmtpolice
fmtpolice: $(PWD)/_testing/bin/fmtpolice
fmtpolice: $(PWD)/_testing/bin/fmtpolice $(GOPATH)/bin/golint
./_testing/bin/fmtpolice

$(GOPATH)/bin/golint:
go get -u golang.org/x/lint/golint

$(PWD)/_testing/bin/fmtpolice:
curl -sL https://raw.githubusercontent.com/rafecolton/fmtpolice/master/fmtpolice -o $@ && \
chmod +x $@
Expand All @@ -102,20 +107,13 @@ $(GOPATH)/bin/gox:
gopath:
@echo "\$$GOPATH = $(GOPATH)"

$(GOPATH)/bin/godep:
go get github.com/tools/godep

.PHONY: save
save: $(GOPATH)/bin/godep
godep save

$(PWD)/_testing/bin/coverage:
curl -sL https://raw.githubusercontent.com/rafecolton/fmtpolice/master/coverage -o $@ && \
chmod +x $@

.PHONY: coverage
coverage: $(PWD)/_testing/bin/coverage
go get -u code.google.com/p/go.tools/cmd/cover || go get -u golang.org/x/tools/cmd/cover
go get -u golang.org/x/tools/cmd/cover
go get -u github.com/axw/gocov/gocov
./_testing/bin/coverage

Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Other useful docs:

## Getting Started

0. Install `docker-builder`
0. Run`docker-builder --help`
1. Install `docker-builder`
1. Run`docker-builder --help`

### Installing `docker-builder`

Expand All @@ -31,6 +31,8 @@ Other useful docs:
```bash
git clone https://github.com/rafecolton/docker-builder
cd docker-builder
go get ./...
go get -u golang.org/x/lint/golint
make # clean build test
```

Expand Down
42 changes: 42 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
module github.com/rafecolton/docker-builder

go 1.14

require (
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/BurntSushi/toml v0.1.1-0.20150501104042-056c9bc7be71
github.com/Microsoft/go-winio v0.4.14 // indirect
github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
github.com/Sirupsen/logrus v1.0.2-0.20170726124705-259b4b7f450a
github.com/codegangsta/cli v1.11.1-0.20151120215642-0302d3914d2a
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0 // indirect
github.com/docker/docker v1.4.2-0.20170724225022-92b3dcb60138
github.com/docker/go-connections v0.3.0 // indirect
github.com/docker/go-units v0.3.2 // indirect
github.com/fsouza/go-dockerclient v0.0.0-20170725183713-e991fbef2be0 // indirect
github.com/go-martini/martini v0.0.0-20151114142712-15a47622d6a9
github.com/gogo/protobuf v0.0.0-20170720144805-7b6c6391c4ff // indirect
github.com/golang/protobuf v1.3.5 // indirect
github.com/hashicorp/go-cleanhttp v0.0.0-20170211013415-3573b8b52aa7 // indirect
github.com/kelseyhightower/envconfig v1.3.1-0.20170523190722-70f0258d44cb
github.com/martini-contrib/auth v0.0.0-20150219114609-fa62c19b7ae8
github.com/moby/moby v1.4.2-0.20170724225022-92b3dcb60138 // indirect
github.com/modcloth/go-fileutils v0.0.0-20141210061911-f2bf9a2a6853
github.com/modcloth/kamino v0.1.3-0.20141121051143-10e9b9ebe46e
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
github.com/onsi/ginkgo v1.4.1-0.20170725030731-8382b23d18db
github.com/onsi/gocleanup v0.0.0-20140331211545-c1a5478700b5
github.com/onsi/gomega v1.2.0
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
github.com/opencontainers/image-spec v1.0.1-0.20170720143143-ef2b9a1d6966 // indirect
github.com/opencontainers/runc v1.0.0-rc3.0.20170725134754-5951cf5f36e1 // indirect
github.com/rafecolton/go-dockerclient-quick v0.0.0-20141218223604-ebab26ac4bc4 // indirect
github.com/rafecolton/go-dockerclient-sort v0.0.0-20141111135947-127186d3d0bd // indirect
github.com/rafecolton/go-gitutils v0.0.0-20141203024321-981699062113
github.com/rafecolton/vauth v0.1.2
github.com/stretchr/testify v1.5.1 // indirect
github.com/winchman/builder-core v0.2.3-0.20170726143510-79bf5d150337
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65 // indirect
gopkg.in/yaml.v2 v2.2.8 // indirect
)
Loading