fix error

This commit is contained in:
maikkeli 2016-01-28 00:30:05 +10:30
parent e8ccca213f
commit 6fe549f92e

View File

@ -62,7 +62,7 @@ WORKDIR /srv/ledgersmb
# 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 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"
#RUN sed -i \ #RUN sed -i \