paco/ledgersmb-docker
1
0
Fork 0
mirror of https://github.com/ledgersmb/ledgersmb-docker.git synced 2025-04-19 14:47:12 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ledgersmb/master' into repo-caching-and-version-build-arg

Browse Source 
# Conflicts:
#	Dockerfile
This commit is contained in:
maikkeli 2016-01-29 19:09:24 +10:30
parent ad5a4eabab
commit df0c5a29f8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Dockerfile
View File

@ -36,9 +36,10 @@ RUN apt-get install -y \
PGObject::Type::DateTime \ PGObject::Type::DateTime \
App::LedgerSMB::Admin App::LedgerSMB::Admin
WORKDIR /srv # Install LedgerSMB
RUN git clone https://github.com/ledgersmb/LedgerSMB.git ledgersmb RUN cd /srv && \
git clone https://github.com/ledgersmb/LedgerSMB.git ledgersmb
# Set LedgerSMB version (git tag/branch/commit) # Set LedgerSMB version (git tag/branch/commit)
# Change LSMB_VERSION or use --build-arg on docker build commandline; # Change LSMB_VERSION or use --build-arg on docker build commandline;
@ -58,8 +59,10 @@ ENV LSMB_VERSION ${LSMB_VERSION}
# 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 cd /srv/ledgersmb \
&& git fetch \ WORKDIR /srv/ledgersmb
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")