change WORKDIR back into a cd &&

As used in the source of the fork. (WORKDIR is persistent, cd && isn't).
This commit is contained in:
maikkeli 2016-01-28 13:43:57 +10:30
parent 1ac4b71595
commit 4ed26c274e

View File

@ -56,11 +56,11 @@ ARG CACHEBREAK
ARG LSMB_VERSION=1.5.0-beta3 ARG LSMB_VERSION=1.5.0-beta3
ENV LSMB_VERSION ${LSMB_VERSION} ENV LSMB_VERSION ${LSMB_VERSION}
WORKDIR /srv/ledgersmb
# fetch changes to repo since possibly cached git clone above. # fetch changes to repo since possibly cached git clone above.
# checkout specified tag/branch/commit (**NOTE above) # checkout specified tag/branch/commit (**NOTE above)
# merge changes to current checked out branch # merge changes to current checked out branch
RUN git fetch \ RUN cd /srv/ledgersmb \
&& git fetch \
&& git checkout $LSMB_VERSION \ && git checkout $LSMB_VERSION \
&& git merge || echo "git merge failed - this is expected if [$LSMB_VERSION] isn't a branch" && git merge || echo "git merge failed - this is expected if [$LSMB_VERSION] isn't a branch"