Commit 250a2ddb authored by jackgr's avatar jackgr
Browse files

Move push and container builds to rootfs directories

parent c431d16f
No related merge requests found
Showing with 41 additions and 17 deletions
+41 -17
...@@ -12,21 +12,24 @@ ...@@ -12,21 +12,24 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
.PHONY: info
info:
$(MAKE) -C $(ROOTFS) $@
.PHONY: gocheck
ifndef GOPATH ifndef GOPATH
$(error No GOPATH set) $(error No GOPATH set)
endif endif
include include.mk
GO_DIRS ?= $(shell glide nv -x ) GO_DIRS ?= $(shell glide nv -x )
GO_PKGS ?= $(shell glide nv) GO_PKGS ?= $(shell glide nv)
.PHONY: build .PHONY: build
build: build: gocheck
@scripts/build-go.sh @scripts/build-go.sh
.PHONY: build-cross .PHONY: build-cross
build-cross: build-cross: gocheck
@BUILD_CROSS=1 scripts/build-go.sh @BUILD_CROSS=1 scripts/build-go.sh
.PHONY: all .PHONY: all
...@@ -40,14 +43,18 @@ clean: ...@@ -40,14 +43,18 @@ clean:
.PHONY: test .PHONY: test
test: build test-style test-unit test: build test-style test-unit
ROOTFS := rootfs
.PHONY: push .PHONY: push
push: container push: all
$(MAKE) -C $(ROOTFS) $@
.PHONY: container .PHONY: container
container: .project .docker container: all
$(MAKE) -C $(ROOTFS) $@
.PHONY: test-unit .PHONY: test-unit
test-unit: test-unit:
@echo Running tests... @echo Running tests...
go test -v $(GO_PKGS) go test -v $(GO_PKGS)
...@@ -94,12 +101,3 @@ ifndef HAS_GOX ...@@ -94,12 +101,3 @@ ifndef HAS_GOX
go get -u github.com/mitchellh/gox go get -u github.com/mitchellh/gox
endif endif
glide install glide install
.PHONY: .project
.project:
@if [[ -z "${PROJECT}" ]]; then echo "PROJECT variable must be set"; exit 1; fi
.PHONY: .docker
.docker:
@if [[ -z `which docker` ]] || ! docker version &> /dev/null; then echo "docker is not installed correctly"; exit 1; fi
# Copyright 2015 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
SUBDIRS := expandybird/. resourcifier/. manager/.
TARGETS := info push container
SUBDIRS_TARGETS := \
$(foreach t,$(TARGETS),$(addsuffix $t,$(SUBDIRS)))
.PHONY : $(TARGETS) $(SUBDIRS_TARGETS)
$(TARGETS) : % : $(addsuffix %,$(SUBDIRS))
$(SUBDIRS_TARGETS) :
$(MAKE) -C $(@D) $(@F:.%=%)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment