Merge pull request #266 from tomdee/makefile

Clean up Makefile
projectcalico · Jun 8, 2018 · b0fa8d5 · b0fa8d5
2 parents a04d995 + 514782d
commit b0fa8d5
Show file tree

Hide file tree

Showing 9 changed files with 228 additions and 249 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 build/
 dist/
+bin/
 *.tar
 *.created
 *.coverage

diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Tigera, Inc
+# Copyright 2015-2018 Tigera, Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +14,5 @@
 FROM amd64/alpine:3.7
 LABEL maintainer "Casey Davenport <[email protected]>"
 
-ADD dist/kube-controllers-linux-amd64 /usr/bin/kube-controllers
+ADD bin/kube-controllers-linux-amd64 /usr/bin/kube-controllers
 ENTRYPOINT ["/usr/bin/kube-controllers"]
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Tigera, Inc
+# Copyright 2015-2018 Tigera, Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +14,5 @@
 FROM arm64v8/alpine:3.7
 LABEL maintainer "Casey Davenport <[email protected]>"
 
-ADD dist/kube-controllers-linux-amd64 /usr/bin/kube-controllers
+ADD bin/kube-controllers-linux-amd64 /usr/bin/kube-controllers
 ENTRYPOINT ["/usr/bin/kube-controllers"]
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Tigera, Inc
+# Copyright 2015-2018 Tigera, Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +14,5 @@
 FROM ppc64le/alpine:3.7
 LABEL maintainer "Casey Davenport <[email protected]>"
 
-ADD dist/kube-controllers-linux-ppc64le /usr/bin/kube-controllers
+ADD bin/kube-controllers-linux-ppc64le /usr/bin/kube-controllers
 ENTRYPOINT ["/usr/bin/kube-controllers"]
diff --git a/Dockerfile.s390x b/Dockerfile.s390x
@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Tigera, Inc
+# Copyright 2015-2018 Tigera, Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,5 +14,5 @@
 FROM s390x/alpine:3.7
 LABEL maintainer "LoZ Open Source Ecosystem (https://www.ibm.com/developerworks/community/groups/community/lozopensource)"
 
-ADD dist/kube-controllers-linux-s390x /usr/bin/kube-controllers
+ADD bin/kube-controllers-linux-s390x /usr/bin/kube-controllers
 ENTRYPOINT ["/usr/bin/kube-controllers"]