Skip to content

Commit 8d002cd

Browse files
author
Fabian Holler
committed
remove dockerfiles
we don't use them, the targets in the Makefile are replaced by ones that do not use docker
1 parent 778b1b5 commit 8d002cd

File tree

4 files changed

+13
-38
lines changed

4 files changed

+13
-38
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
build
33
release
44
vendor
5+
registrator
56

67
dist/

Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

Dockerfile.dev

Lines changed: 0 additions & 11 deletions
This file was deleted.

Makefile

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
NAME=registrator
2-
VERSION=$(shell cat VERSION)
3-
DEV_RUN_OPTS ?= consul:
1+
default: all
42

5-
dev:
6-
docker build -f Dockerfile.dev -t $(NAME):dev .
7-
docker run --rm \
8-
-v /var/run/docker.sock:/tmp/docker.sock \
9-
$(NAME):dev /bin/registrator $(DEV_RUN_OPTS)
3+
.PHONY: registrator
4+
registrator:
5+
CGO_ENABLED=0 go build -trimpath -o $@ *.go
106

11-
build:
12-
mkdir -p build
13-
docker build -t $(NAME):$(VERSION) .
14-
docker save $(NAME):$(VERSION) | gzip -9 > build/$(NAME)_$(VERSION).tgz
7+
.PHONY: check
8+
check:
9+
golangci-lint run
1510

11+
.PHONY: test
12+
test:
13+
go test -race ./...
1614

17-
.PHONY: build dev
15+
.PHONY: all
16+
all: registrator check test

0 commit comments

Comments
 (0)