From b73278bbbb46931c098fcf8e14e3d57221a62c81 Mon Sep 17 00:00:00 2001 From: jackgr Date: Mon, 2 Nov 2015 17:28:19 -0800 Subject: [PATCH] Fixed paths in Dockerfiles for manager and resourcifier. --- expandybird/Dockerfile | 2 +- manager/Dockerfile | 33 ++++++++++++++++++++++++++------- resourcifier/Dockerfile | 31 +++++++++++++++++++------------ 3 files changed, 46 insertions(+), 20 deletions(-) diff --git a/expandybird/Dockerfile b/expandybird/Dockerfile index 6125621f0..6d95f9709 100644 --- a/expandybird/Dockerfile +++ b/expandybird/Dockerfile @@ -13,4 +13,4 @@ RUN pip install -r ./requirements.txt EXPOSE 8080 -ENTRYPOINT ["./expandybird"] +ENTRYPOINT ["./expandybird", "-expansion_binary", "./expansion/expansion.py"] diff --git a/manager/Dockerfile b/manager/Dockerfile index b89ebaaf2..1b1b27248 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -15,20 +15,39 @@ FROM golang:1.4 MAINTAINER Jack Greenfield -WORKDIR /go/src +RUN mkdir -p "$GOPATH/src/github.com" && chmod 777 "$GOPATH/src/github.com" -RUN mkdir -p manager +WORKDIR "$GOPATH/src/github.com" + +RUN mkdir -p manager && chmod 777 manager COPY manager manager -RUN mkdir -p util +RUN mkdir -p util && chmod 777 util COPY util util -RUN mkdir -p version +RUN mkdir -p version && chmod 777 version COPY version version -RUN go-wrapper download manager/... -RUN go-wrapper install manager/... +WORKDIR "$GOPATH" + +RUN mkdir -p src/github.com/kubernetes/deployment-manager \ + && chmod 777 src/github.com/kubernetes/deployment-manager + +RUN mkdir -p src/github.com/kubernetes/deployment-manager/manager \ + && chmod 777 src/github.com/kubernetes/deployment-manager/manager +COPY manager src/github.com/kubernetes/deployment-manager/manager + +RUN mkdir -p src/github.com/kubernetes/deployment-manager/util \ + && chmod 777 src/github.com/kubernetes/deployment-manager/util +COPY util src/github.com/kubernetes/deployment-manager/util + +RUN mkdir -p src/github.com/kubernetes/deployment-manager/version \ + && chmod 777 src/github.com/kubernetes/deployment-manager/version +COPY version src/github.com/kubernetes/deployment-manager/version + +RUN go-wrapper download github.com/kubernetes/deployment-manager/manager/... +RUN go-wrapper install github.com/kubernetes/deployment-manager/manager/... EXPOSE 8080 -ENTRYPOINT ["go-wrapper", "run"] +ENTRYPOINT ["bin/manager"] diff --git a/resourcifier/Dockerfile b/resourcifier/Dockerfile index 6c2fa9e42..347c2ef24 100644 --- a/resourcifier/Dockerfile +++ b/resourcifier/Dockerfile @@ -32,23 +32,30 @@ RUN wget -O - "$KUBE_DOWLOAD" 2> /dev/null | tar xzf - -C /tmp "$KUBE_COMMAND" \ RUN apt-get purge -y --auto-remove wget -WORKDIR /go/src +WORKDIR "$GOPATH" -RUN mkdir -p expandybird -COPY expandybird expandybird +RUN mkdir -p src/github.com/kubernetes/deployment-manager \ + && chmod 777 src/github.com/kubernetes/deployment-manager -RUN mkdir -p resourcifier -COPY resourcifier resourcifier +RUN mkdir -p src/github.com/kubernetes/deployment-manager/expandybird \ + && chmod 777 src/github.com/kubernetes/deployment-manager/expandybird +COPY expandybird src/github.com/kubernetes/deployment-manager/expandybird -RUN mkdir -p util -COPY util util +RUN mkdir -p src/github.com/kubernetes/deployment-manager/resourcifier \ + && chmod 777 src/github.com/kubernetes/deployment-manager/resourcifier +COPY resourcifier src/github.com/kubernetes/deployment-manager/resourcifier -RUN mkdir -p version -COPY version version +RUN mkdir -p src/github.com/kubernetes/deployment-manager/util \ + && chmod 777 src/github.com/kubernetes/deployment-manager/util +COPY util src/github.com/kubernetes/deployment-manager/util -RUN go-wrapper download resourcifier/... -RUN go-wrapper install resourcifier/... +RUN mkdir -p src/github.com/kubernetes/deployment-manager/version \ + && chmod 777 src/github.com/kubernetes/deployment-manager/version +COPY version src/github.com/kubernetes/deployment-manager/version + +RUN go-wrapper download github.com/kubernetes/deployment-manager/resourcifier/... +RUN go-wrapper install github.com/kubernetes/deployment-manager/resourcifier/... EXPOSE 8080 -ENTRYPOINT ["go-wrapper", "run", "--kubectl=/usr/local/bin/kubectl"] +ENTRYPOINT ["bin/resourcifier", "--kubectl=/usr/local/bin/kubectl"]