Merge branch 'master' of ssh://github.com/weaveworks/scope

This commit is contained in:
Tom Wilkie
2015-06-02 10:12:33 +00:00
3 changed files with 5666 additions and 2175 deletions

View File

@@ -16,7 +16,7 @@ SCOPE_VERSION=$(shell git rev-parse HEAD)
all: $(SCOPE_EXPORT)
$(SCOPE_EXPORT): $(APP_EXE) $(PROBE_EXE) docker/*
@if [ -z '$(DOCKER_SQUASH)' ]; then echo "Please install docker-squash by running 'make dep'." && exit 1; fi
@if [ -z '$(DOCKER_SQUASH)' ]; then echo "Please install docker-squash by running 'make deps'." && exit 1; fi
cp $(APP_EXE) $(PROBE_EXE) docker/
$(SUDO) docker build -t $(SCOPE_IMAGE) docker/
$(SUDO) docker save $(SCOPE_IMAGE):latest | sudo $(DOCKER_SQUASH) -t $(SCOPE_IMAGE) | tee $@ | $(SUDO) docker load

View File

@@ -2,7 +2,7 @@
[![Circle CI](https://circleci.com/gh/weaveworks/scope/tree/master.svg?style=shield)](https://circleci.com/gh/weaveworks/scope/tree/master) [![Coverage Status](https://coveralls.io/repos/weaveworks/scope/badge.svg)](https://coveralls.io/r/weaveworks/scope) [![Sourcegraph](https://sourcegraph.com/api/repos/github.com/weaveworks/scope/.badges/status.svg)](https://sourcegraph.com/github.com/weaveworks/scope)
![Weave Scope Screenshot](http://weave.works/scope/assets/img/feature-1.png)
![Weave Scope Screenshot](http://weave.works/img/header-image-left.png)
## Overview

File diff suppressed because it is too large Load Diff