1.5.0-beta3

Dockerfile

@@ -1,6 +1,9 @@
 FROM        perl:5
 MAINTAINER  Freelock john@freelock.com
 
+# Build time variables
+ENV LSMB_VERSION 1.5.0-beta3
+
 
 # Install Perl, Tex, Starman, psql client, and all dependencies
 RUN DEBIAN_FRONTENT=noninteractive && \
@@ -16,32 +19,20 @@ RUN DEBIAN_FRONTENT=noninteractive && \
   libconfig-inifiles-perl libnamespace-autoclean-perl \
   libcarp-always-perl libjson-perl \
   libtemplate-plugin-latex-perl texlive-latex-recommended \
-  texlive-latex-base texlive-latex-extra \
-  texlive-xetex \
+  libnet-tclink-perl \
   libxml-twig-perl \
-  libtex-encode-perl \
-  libdevel-trace-perl \
   starman \
   postgresql-client-9.4 \
   ssmtp
 
-# Build time variables
-ENV LSMB_VERSION 1.4.31
-
 # Install LedgerSMB
 
 RUN cd /srv && \
-  git clone -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb
+  git clone https://github.com/ledgersmb/LedgerSMB.git ledgersmb
 
 WORKDIR /srv/ledgersmb
 
-
-# 1.4.29+ requirements
-RUN cpanm --quiet --notest \
-  --with-feature=starman \
-  --with-feature=latex-pdf-ps \
-  --with-feature=openoffice \
-  --installdeps .
+RUN git checkout $LSMB_VERSION
 
 #RUN sed -i \
 #  -e "s/short_open_tag = Off/short_open_tag = On/g" \
@@ -66,17 +57,28 @@ ENV POSTGRES_HOST postgres
 COPY start.sh /usr/bin/start.sh
 COPY update_ssmtp.sh /usr/bin/update_ssmtp.sh
 
-#RUN  cpanm \
-#   CGI::Compile
-
 
 RUN chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
   chmod +x /usr/bin/update_ssmtp.sh /usr/bin/start.sh && \
   mkdir -p /var/www
 
-# Work around an aufs bug related to directory permissions:
-RUN mkdir -p /tmp && \
-  chmod 1777 /tmp
+# 1.5 requirements
+RUN apt-get install -y \
+    libpgobject-perl \
+    libpgobject-simple-perl \
+    libpgobject-simple-role-perl \
+    libpgobject-util-dbmethod-perl
+RUN  cpanm -nq \
+    Carton PGObject::Type::BigFloat \
+    PGObject::Composite \
+    PGObject::Type::JSON \
+    PGObject::Type::Composite \
+    PGObject::Type::DateTime \
+    App::LedgerSMB::Admin
+
+# Not sure why this is not set correctly, and also why
+# it gets overridden here -- moved to start.sh.
+# ENV PERL5LIB /usr/local/lib/perl5/site_perl/5.22.0
 
 # Internal Port Expose
 EXPOSE 5000

start.sh

@@ -13,11 +13,13 @@ if [[ ! -f ledgersmb.conf ]]; then
 fi
 
 if [ ! -z ${CREATE_DATABASE+x} ]; then
-  perl tools/prepare-company-database.pl --company $CREATE_DATABASE \
+  perl tools/dbsetup.pl --company $CREATE_DATABASE \
   --host $POSTGRES_HOST \
-  --owner postgres \
-  --password "$POSTGRES_PASS"
+  --postgres_password "$POSTGRES_PASS"
 fi
 
+# Needed for modules loaded by cpanm
+export PERL5LIB=/usr/local/lib/perl5/site_perl/5.22.0
+
 # start ledgersmb
 exec starman tools/starman.psgi