Skip to content

Commit

Permalink
fix(logger): use godep for dependencies
Browse files Browse the repository at this point in the history
This issue was brought up when building a new release of images for
deployment. The logger relied on `go get` to fetch dependencies. Because
there was a breaking change in the etcd client[1], the logger failed to
connect to the cluster. We have moved over to a global Godeps for
managing dependencies, so this changes the compilation on the host to
follow the other components' build process.

[1]: coreos/go-etcd@5348c80#diff-33c1223aac4ef741731cc8c73b4d7777L295
  • Loading branch information
Matthew Fisher committed Jan 30, 2015
1 parent 055719e commit 1a8a656
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
7 changes: 0 additions & 7 deletions logger/Dockerfile

This file was deleted.

7 changes: 3 additions & 4 deletions logger/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ COMPONENT = logger
IMAGE = $(IMAGE_PREFIX)$(COMPONENT):$(BUILD_TAG)
BUILD_IMAGE := $(COMPONENT)-build
DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
BINARY_DEST_DIR = image/bin

build: check-docker
docker build -t $(BUILD_IMAGE) .
docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/logger image/bin/
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 godep go build -a -v -ldflags '-s' -o $(BINARY_DEST_DIR)/logger github.com/deis/deis/logger || exit 1
docker build -t $(IMAGE) image
rm -rf image/bin/logger
-docker rm -f `docker ps | grep logger-build | awk '{print $$1}'`

clean: check-docker check-registry
rm -f image/bin/logger
docker rmi $(IMAGE)

full-clean: check-docker check-registry
Expand Down

0 comments on commit 1a8a656

Please sign in to comment.