From 2add82e0700198711260dbf3d6d9c4433dfd4e5c Mon Sep 17 00:00:00 2001
From: John Locke <john@freelock.com>
Date: Mon, 30 May 2016 08:52:19 -0700
Subject: [PATCH] Update for 1.4.29, streamlined install process

---
 Dockerfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index da5fccf..0e4e3d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,6 @@
 FROM        perl:5
 MAINTAINER  Freelock john@freelock.com
 
-# Build time variables
-ENV LSMB_VERSION 1.4.28
-
 
 # Install Perl, Tex, Starman, psql client, and all dependencies
 RUN DEBIAN_FRONTENT=noninteractive && \
@@ -28,20 +25,23 @@ RUN DEBIAN_FRONTENT=noninteractive && \
   postgresql-client-9.4 \
   ssmtp
 
-<<<<<<< HEAD
-=======
-# Cpan requirements
-RUN cpanm -nq \
-    LaTeX::Driver \
+# Build time variables
+ENV LSMB_VERSION 1.4.29
 
 # Install LedgerSMB
 
 RUN cd /srv && \
-  git clone https://github.com/ledgersmb/LedgerSMB.git ledgersmb
+  git clone -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb
 
 WORKDIR /srv/ledgersmb
 
-RUN git checkout $LSMB_VERSION
+
+# 1.4.29+ requirements
+RUN cpanm --quiet --notest \
+  --with-feature=starman \
+  --with-feature=latex-pdf-ps \
+  --with-feature=openoffice \
+  --installdeps .
 
 #RUN sed -i \
 #  -e "s/short_open_tag = Off/short_open_tag = On/g" \