From 4ed26c274e1eb91c4806145f06149cbbcc27bc42 Mon Sep 17 00:00:00 2001 From: maikkeli Date: Thu, 28 Jan 2016 13:43:57 +1030 Subject: [PATCH] change WORKDIR back into a cd && As used in the source of the fork. (WORKDIR is persistent, cd && isn't). --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 59d322f..3087042 100644 --- a/Dockerfile +++ b/Dockerfile @@ -56,11 +56,11 @@ ARG CACHEBREAK ARG LSMB_VERSION=1.5.0-beta3 ENV LSMB_VERSION ${LSMB_VERSION} -WORKDIR /srv/ledgersmb # fetch changes to repo since possibly cached git clone above. # checkout specified tag/branch/commit (**NOTE above) # merge changes to current checked out branch -RUN git fetch \ +RUN cd /srv/ledgersmb \ + && git fetch \ && git checkout $LSMB_VERSION \ && git merge || echo "git merge failed - this is expected if [$LSMB_VERSION] isn't a branch"