Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
ARM
k8s
Kured
Commits
aefc4ea4
Unverified
Commit
aefc4ea4
authored
Jun 05, 2018
by
Adam Harrison
Committed by
GitHub
Jun 05, 2018
Browse files
Merge pull request #8 from weaveworks/build-on-osx
Don't call `sudo docker` when building on macOS
parents
fd752b83
0e75f74c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
aefc4ea4
...
...
@@ -3,6 +3,7 @@
DH_ORG
=
weaveworks
VERSION
=
$(
shell
git symbolic-ref
--short
HEAD
)
-
$(
shell
git rev-parse
--short
HEAD
)
SUDO
=
$(
shell
docker info
>
/dev/null 2>&1
||
echo
"sudo -E"
)
all
:
image
...
...
@@ -22,13 +23,13 @@ cmd/kured/kured: cmd/kured/*.go
build/.image.done
:
cmd/kured/Dockerfile cmd/kured/kured
mkdir
-p
build
cp
$^
build
sudo
-E
docker build
-t
quay.io/
$(DH_ORG)
/kured:
$(VERSION)
-f
build/Dockerfile ./build
$(SUDO)
docker build
-t
quay.io/
$(DH_ORG)
/kured:
$(VERSION)
-f
build/Dockerfile ./build
touch
$@
image
:
build/.image.done
publish-image
:
image
sudo
-E
docker push quay.io/
$(DH_ORG)
/kured:
$(VERSION)
$(SUDO)
docker push quay.io/
$(DH_ORG)
/kured:
$(VERSION)
minikube-publish
:
image
sudo
-E
docker save quay.io/
$(DH_ORG)
/kured:
$(VERSION)
|
(
eval
$$
(
minikube docker-env
)
&&
docker load
)
$(SUDO)
docker save quay.io/
$(DH_ORG)
/kured:
$(VERSION)
|
(
eval
$$
(
minikube docker-env
)
&&
docker load
)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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