From e2c96cfa8550c8e42b590d210265027cc66533fd Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Tue, 31 Jan 2017 16:50:24 +0000 Subject: [PATCH] Remove/move down WORKDIR lines in Dockerfiles They seem to stop Docker using its build cache. Removing the line entirely stops weaveproxy from working, as it assumes it can exec `./weave` from the current directory. --- prog/weaveexec/Dockerfile.template | 2 +- prog/weaver/Dockerfile.template | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/prog/weaveexec/Dockerfile.template b/prog/weaveexec/Dockerfile.template index 09d76848..6e6b0c99 100644 --- a/prog/weaveexec/Dockerfile.template +++ b/prog/weaveexec/Dockerfile.template @@ -12,7 +12,6 @@ LABEL works.weave.role=system \ org.label-schema.vcs-url="https://github.com/weaveworks/weave" \ org.label-schema.vendor="Weaveworks" -WORKDIR /home/weave ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"] RUN apk add --update \ @@ -32,3 +31,4 @@ ADD ./weavewait /w/w ADD ./weavewait_noop /w-noop/w ADD ./weavewait_nomcast /w-nomcast/w ADD ./docker /usr/bin/ +WORKDIR /home/weave diff --git a/prog/weaver/Dockerfile.template b/prog/weaver/Dockerfile.template index 8d60a095..78b95c36 100644 --- a/prog/weaver/Dockerfile.template +++ b/prog/weaver/Dockerfile.template @@ -1,5 +1,4 @@ FROM DOCKERHUB_USER/weaveexecARCH_EXT -WORKDIR /home/weave ADD ./weaver /home/weave/ ADD weavedata.db /weavedb/ COPY ca-certificates.crt /etc/ssl/certs/