From 7100adbef0f1a28f682c869144251d7c8166eb03 Mon Sep 17 00:00:00 2001 From: jackgr Date: Wed, 2 Mar 2016 19:02:01 -0800 Subject: [PATCH] Remove Makefiles and Dockerfiles in cmd directory --- cmd/expandybird/Dockerfile | 69 ------------------------------------ cmd/expandybird/Makefile | 40 --------------------- cmd/manager/Dockerfile | 42 ---------------------- cmd/manager/Makefile | 40 --------------------- cmd/resourcifier/Dockerfile | 41 --------------------- cmd/resourcifier/Makefile | 42 ---------------------- include.mk | 9 ----- start.sh => scripts/start.sh | 0 stop.sh => scripts/stop.sh | 6 ++-- 9 files changed, 3 insertions(+), 286 deletions(-) delete mode 100644 cmd/expandybird/Dockerfile delete mode 100644 cmd/expandybird/Makefile delete mode 100644 cmd/manager/Dockerfile delete mode 100644 cmd/manager/Makefile delete mode 100644 cmd/resourcifier/Dockerfile delete mode 100644 cmd/resourcifier/Makefile delete mode 100644 include.mk rename start.sh => scripts/start.sh (100%) rename stop.sh => scripts/stop.sh (77%) diff --git a/cmd/expandybird/Dockerfile b/cmd/expandybird/Dockerfile deleted file mode 100644 index 197359b2e..000000000 --- a/cmd/expandybird/Dockerfile +++ /dev/null @@ -1,69 +0,0 @@ -# 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. - -FROM python:2 -MAINTAINER Jack Greenfield - -RUN ln -s /usr/local/bin/python /usr/bin/python - -RUN apt-get update \ - && apt-get autoremove -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -# following lines copied from golang:1.6 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - gcc \ - libc6-dev \ - make \ - && rm -rf /var/lib/apt/lists/* - -ENV GOLANG_VERSION 1.6 -ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz -ENV GOLANG_DOWNLOAD_SHA256 5470eac05d273c74ff8bac7bef5bad0b5abbd1c4052efbdbc8db45332e836b0b - -RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \ - && echo "$GOLANG_DOWNLOAD_SHA256 golang.tar.gz" | sha256sum -c - \ - && tar -C /usr/local -xzf golang.tar.gz \ - && rm golang.tar.gz - -ENV GOPATH /go -ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH - -RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" - -#end copied lines - -COPY . "$GOPATH"/src/github.com/kubernetes/deployment-manager -WORKDIR "$GOPATH"/src/github.com/kubernetes/deployment-manager/expandybird - -RUN go get -v -d . -RUN go install -v . - -RUN mkdir -p /var/expandybird/expansion -WORKDIR /var/expandybird - -COPY ./expandybird/expansion /var/expandybird/expansion - -COPY ./expandybird/requirements.txt /var/expandybird/requirements.txt -RUN pip install --no-cache-dir -r /var/expandybird/requirements.txt - -RUN cp "$GOPATH"/bin/expandybird /var/expandybird/expandybird -RUN /bin/rm -rf "$GOPATH" - -EXPOSE 8080 - -ENTRYPOINT ["/var/expandybird/expandybird", "-expansion_binary", "/var/expandybird/expansion/expansion.py"] diff --git a/cmd/expandybird/Makefile b/cmd/expandybird/Makefile deleted file mode 100644 index 16f0c7882..000000000 --- a/cmd/expandybird/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# 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. - -include ../include.mk - -.PHONY : all build push container clean .project - -DOCKER_REGISTRY := gcr.io -PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) -IMAGE := expandybird - -ROOT_DIR := $(abspath ./..) -DIR = $(ROOT_DIR) - -push: container -ifeq ($(DOCKER_REGISTRY),gcr.io) - gcloud docker push $(PREFIX)/$(IMAGE):$(TAG) -else - docker push $(PREFIX)/$(IMAGE):$(TAG) -endif - -container: - docker build -t $(PREFIX)/$(IMAGE):$(TAG) -f Dockerfile $(DIR) - -clean: - -docker rmi $(PREFIX)/$(IMAGE):$(TAG) - -.PHONY: test -test: lint vet test-unit diff --git a/cmd/manager/Dockerfile b/cmd/manager/Dockerfile deleted file mode 100644 index e88263915..000000000 --- a/cmd/manager/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -# 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. - -FROM golang:1.6 -MAINTAINER Jack Greenfield - -RUN apt-get update \ - && apt-get autoremove -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -WORKDIR /usr/local/bin -ENV KUBE_VERSION v1.0.5 - -RUN curl -fsSL -o kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBE_VERSION/bin/linux/amd64/kubectl \ - && chmod +x kubectl - -COPY . "$GOPATH"/src/github.com/kubernetes/deployment-manager - -WORKDIR "$GOPATH"/src/github.com/kubernetes/deployment-manager/manager - -RUN go-wrapper download -RUN go-wrapper install - -WORKDIR /usr/local/bin -RUN cp "$GOPATH"/bin/manager /usr/local/bin -RUN /bin/rm -rf "$GOPATH" - -EXPOSE 8080 - -ENTRYPOINT ["/usr/local/bin/manager", "--kubectl=/usr/local/bin/kubectl"] diff --git a/cmd/manager/Makefile b/cmd/manager/Makefile deleted file mode 100644 index 209c874f2..000000000 --- a/cmd/manager/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# 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. - -include ../include.mk - -.PHONY : all build push container clean .project - -DOCKER_REGISTRY := gcr.io -PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) -IMAGE := manager - -ROOT_DIR := $(abspath ./..) -DIR = $(ROOT_DIR) - -push: container -ifeq ($(DOCKER_REGISTRY),gcr.io) - gcloud docker push $(PREFIX)/$(IMAGE):$(TAG) -else - docker push $(PREFIX)/$(IMAGE):$(TAG) -endif - -container: - docker build -t $(PREFIX)/$(IMAGE):$(TAG) -f Dockerfile $(DIR) - -clean: - -docker rmi $(PREFIX)/$(IMAGE):$(TAG) - -.PHONY: test -test: lint vet test-unit diff --git a/cmd/resourcifier/Dockerfile b/cmd/resourcifier/Dockerfile deleted file mode 100644 index c02984055..000000000 --- a/cmd/resourcifier/Dockerfile +++ /dev/null @@ -1,41 +0,0 @@ -# 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. - -FROM golang:1.6 - -RUN apt-get update \ - && apt-get autoremove -y \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -WORKDIR /usr/local/bin -ENV KUBE_VERSION v1.0.5 - -RUN curl -fsSL -o kubectl https://storage.googleapis.com/kubernetes-release/release/$KUBE_VERSION/bin/linux/amd64/kubectl \ - && chmod +x kubectl - -COPY . "$GOPATH"/src/github.com/kubernetes/deployment-manager - -WORKDIR "$GOPATH"/src/github.com/kubernetes/deployment-manager/resourcifier - -RUN go-wrapper download -RUN go-wrapper install - -WORKDIR /usr/local/bin -RUN cp "$GOPATH"/bin/resourcifier /usr/local/bin -RUN /bin/rm -rf "$GOPATH" - -EXPOSE 8080 - -ENTRYPOINT ["/usr/local/bin/resourcifier", "--kubectl=/usr/local/bin/kubectl"] diff --git a/cmd/resourcifier/Makefile b/cmd/resourcifier/Makefile deleted file mode 100644 index 9d6eebe1a..000000000 --- a/cmd/resourcifier/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# 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. - -# If you update this image please check the tag value before pushing. - -include ../include.mk - -.PHONY : all build push container clean - -DOCKER_REGISTRY := gcr.io -PREFIX := $(DOCKER_REGISTRY)/$(PROJECT) -IMAGE := resourcifier - -ROOT_DIR := $(abspath ./..) -DIR = $(ROOT_DIR) - -push: container -ifeq ($(DOCKER_REGISTRY),gcr.io) - gcloud docker push $(PREFIX)/$(IMAGE):$(TAG) -else - docker push $(PREFIX)/$(IMAGE):$(TAG) -endif - -container: - docker build -t $(PREFIX)/$(IMAGE):$(TAG) -f Dockerfile $(DIR) - -clean: - -docker rmi $(PREFIX)/$(IMAGE):$(TAG) - -.PHONY: test -test: lint vet test-unit diff --git a/include.mk b/include.mk deleted file mode 100644 index 0d9ff7c3c..000000000 --- a/include.mk +++ /dev/null @@ -1,9 +0,0 @@ -.PHONY: info -info: - @echo "Build tag: ${TAG}" - @echo "Registry: ${DOCKER_REGISTRY}" - @echo "Project: ${PROJECT}" - @echo "Image: ${IMAGE}" - -TAG ?= $(shell echo `date +"%s"`_`date +"%N"`) - \ No newline at end of file diff --git a/start.sh b/scripts/start.sh similarity index 100% rename from start.sh rename to scripts/start.sh diff --git a/stop.sh b/scripts/stop.sh similarity index 77% rename from stop.sh rename to scripts/stop.sh index 7939871b0..70a092ef2 100755 --- a/stop.sh +++ b/scripts/stop.sh @@ -1,21 +1,21 @@ #!/bin/bash echo "Stopping resourcifier..." -RESOURCIFIER=`which resourcifier` +RESOURCIFIER=bin/resourcifier if [[ ! -z $RESOURCIFIER ]] ; then pkill -f $RESOURCIFIER fi echo echo "Stopping expandybird..." -EXPANDYBIRD=`which expandybird` +EXPANDYBIRD=bin/expandybird if [[ ! -z $EXPANDYBIRD ]] ; then pkill -f $EXPANDYBIRD fi echo echo "Stopping deployment manager..." -MANAGER=`which manager` +MANAGER=bin/manager if [[ ! -z $MANAGER ]] ; then pkill -f $MANAGER fi