From 0034b4403339fe084a72ea037fc568bcda853cbc Mon Sep 17 00:00:00 2001
From: John Locke <john@freelock.com>
Date: Mon, 30 May 2016 09:07:08 -0700
Subject: [PATCH] Synchronize dependencies with 1.5 branch

---
 Dockerfile | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 50e0b5f..06843a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,22 +4,25 @@ MAINTAINER  Freelock john@freelock.com
 # Install Perl, Tex, Starman, psql client, and all dependencies
 RUN DEBIAN_FRONTENT=noninteractive && \
   apt-get update && apt-get -y install \
-  git \
-  libdatetime-perl libdbi-perl libdbd-pg-perl \
-  libcgi-simple-perl libtemplate-perl libmime-lite-perl \
-  liblocale-maketext-lexicon-perl libtest-exception-perl \
-  libtest-trap-perl liblog-log4perl-perl libmath-bigint-gmp-perl \
-  libfile-mimeinfo-perl libtemplate-plugin-number-format-perl \
-  libdatetime-format-strptime-perl libconfig-general-perl \
-  libdatetime-format-strptime-perl libio-stringy-perl libmoose-perl \
-  libconfig-inifiles-perl libnamespace-autoclean-perl \
-  libcarp-always-perl libjson-perl \
-  libtemplate-plugin-latex-perl texlive-latex-recommended \
-  libnet-tclink-perl \
-  libxml-twig-perl \
+  libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
+  libdbd-pg-perl libdbi-perl libdatetime-perl \
+  libdatetime-format-strptime-perl libdigest-md5-perl \
+  libfile-mimeinfo-perl libjson-xs-perl libjson-perl \
+  liblocale-maketext-perl liblocale-maketext-lexicon-perl \
+  liblog-log4perl-perl libmime-base64-perl libmime-lite-perl \
+  libmath-bigint-gmp-perl libmoose-perl libnumber-format-perl \
+  libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
+  libpgobject-util-dbmethod-perl libplack-perl libtemplate-perl \
+  libnamespace-autoclean-perl \
+  libtemplate-plugin-latex-perl libtex-encode-perl \
+  libmoosex-nonmoose-perl \
+  texlive-latex-recommended \
+  texlive-xetex \
   starman \
-  postgresql-client-9.4 \
-  ssmtp
+  libopenoffice-oodoc-perl \
+  postgresql-client \
+  ssmtp \
+  git
 
 # Nodejs for doing Dojo build
 RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
@@ -29,11 +32,11 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
 RUN DEBIAN_FRONTENT=noninteractive && apt-get install -y openjdk-7-jre
 
 # Build time variables
-ENV LSMB_VERSION 1.5.0-beta-5
+ENV LSMB_VERSION master
 
 # Install LedgerSMB
 RUN cd /srv && \
-  git clone --recursive -b master https://github.com/ledgersmb/LedgerSMB.git ledgersmb
+  git clone --recursive -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb
 
 WORKDIR /srv/ledgersmb
 
@@ -68,6 +71,9 @@ RUN chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
   chmod +x /usr/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
   mkdir -p /var/www
 
+# Work around an aufs bug related to directory permissions:
+RUN mkdir -p /tmp && \
+  chmod 1777 /tmp
 
 # Internal Port Expose
 EXPOSE 5762