v1.4.26

Dockerfile

@@ -2,7 +2,7 @@ FROM        perl:5
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ENV LSMB_VERSION 1.5.0-beta3
+ENV LSMB_VERSION 1.4.26
 
 
 # Install Perl, Tex, Starman, psql client, and all dependencies
@@ -19,8 +19,11 @@ RUN DEBIAN_FRONTENT=noninteractive && \
   libconfig-inifiles-perl libnamespace-autoclean-perl \
   libcarp-always-perl libjson-perl \
   libtemplate-plugin-latex-perl texlive-latex-recommended \
-  libnet-tclink-perl \
+  texlive-latex-base texlive-latex-extra \
+  texlive-xetex \
   libxml-twig-perl \
+  libtex-encode-perl \
+  libdevel-trace-perl \
   starman \
   postgresql-client-9.4 \
   ssmtp
@@ -57,28 +60,17 @@ 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
 
-# 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
+# Work around an aufs bug related to directory permissions:
+RUN mkdir -p /tmp && \
+  chmod 1777 /tmp
 
 # Internal Port Expose
 EXPOSE 5000

start.sh

@@ -13,13 +13,11 @@ if [[ ! -f ledgersmb.conf ]]; then
 fi
 
 if [ ! -z ${CREATE_DATABASE+x} ]; then
-  perl tools/dbsetup.pl --company $CREATE_DATABASE \
+  perl tools/prepare-company-database.pl --company $CREATE_DATABASE \
   --host $POSTGRES_HOST \
-  --postgres_password "$POSTGRES_PASS"
+  --owner 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