From 20e5cccb11de4c265c569e49ba0c516a6e361bf7 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Fri, 22 Sep 2017 16:17:57 -0400 Subject: [PATCH] Create dockerfile and update makefile to build descheduler container image. --- Dockerfile | 20 ++++++++++++++++++++ Makefile | 13 ++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 000000000..9772958d4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,20 @@ +# Copyright 2017 The Kubernetes Authors. +# +# 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. + +FROM fedora + +MAINTAINER Avesh Agarwal + +COPY _output/bin/descheduler /bin/descheduler +CMD ["/bin/descheduler --help"] diff --git a/Makefile b/Makefile index 1a3a71ed8..9c493d4a8 100644 --- a/Makefile +++ b/Makefile @@ -12,13 +12,24 @@ # # See the License for the specific language governing permissions and # # limitations under the License. +.PHONY: test + +# VERSION is currently based on the last commit +VERSION:=$(shell git rev-parse --short HEAD) + +# IMAGE is the image name of descheduler +IMAGE:=descheduler:$(VERSION) + +all: build build: go build -o _output/bin/descheduler github.com/kubernetes-incubator/descheduler/cmd/descheduler +image: build + docker build -t $(IMAGE) . + clean: rm -rf _output -.PHONY: test test: ./test/run-unit-tests.sh