Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
H
helm3
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
helm3
Commits
250a2ddb
Commit
250a2ddb
authored
Mar 03, 2016
by
jackgr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move push and container builds to rootfs directories
parent
c431d16f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
16 deletions
+40
-16
Makefile
Makefile
+14
-16
Makefile
rootfs/Makefile
+26
-0
No files found.
Makefile
View file @
250a2ddb
...
...
@@ -12,21 +12,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
.PHONY
:
info
info
:
$(MAKE)
-C
$(ROOTFS)
$@
.PHONY
:
gocheck
ifndef
GOPATH
$(error
No
GOPATH
set)
$(error
No
GOPATH
set)
endif
include
include.mk
GO_DIRS
?=
$(
shell
glide nv
-x
)
GO_PKGS
?=
$(
shell
glide nv
)
.PHONY
:
build
build
:
build
:
gocheck
@
scripts/build-go.sh
.PHONY
:
build-cross
build-cross
:
build-cross
:
gocheck
@
BUILD_CROSS
=
1 scripts/build-go.sh
.PHONY
:
all
...
...
@@ -40,11 +43,15 @@ clean:
.PHONY
:
test
test
:
build test-style test-unit
ROOTFS
:=
rootfs
.PHONY
:
push
push
:
container
push
:
all
$(MAKE)
-C
$(ROOTFS)
$@
.PHONY
:
container
container
:
.project .docker
container
:
all
$(MAKE)
-C
$(ROOTFS)
$@
.PHONY
:
test-unit
test-unit
:
...
...
@@ -94,12 +101,3 @@ ifndef HAS_GOX
go
get
-u
github.com/mitchellh/gox
endif
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
rootfs/Makefile
0 → 100644
View file @
250a2ddb
# 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:.%
=
%
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment