1.5.0-beta3

Dockerfile

@@ -1,8 +1,8 @@
-FROM        debian:jessie
+FROM        perl:5
 MAINTAINER  Freelock john@freelock.com
 
 # Build time variables
-ENV LSMB_VERSION 1.3
+ENV LSMB_VERSION 1.5.0-beta3
 
 
 # Install Perl, Tex, Starman, psql client, and all dependencies
@@ -62,6 +62,24 @@ 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
+
 # Internal Port Expose
 EXPOSE 5000
 #USER www-data

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