1.4.30

Dockerfile

@@ -1,6 +1,7 @@
 FROM        perl:5
 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 \
@@ -15,37 +16,32 @@ 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
 
-# 1.5 requirements
-RUN apt-get install -y \
-    libpgobject-perl \
-    libpgobject-simple-perl \
-    libpgobject-simple-role-perl \
-    libpgobject-util-dbmethod-perl \
-    && cpanm -nq \
-    Carton \
-    PGObject::Type::BigFloat \
-    PGObject::Composite \
-    PGObject::Type::JSON \
-    PGObject::Type::Composite \
-    PGObject::Type::DateTime \
-    App::LedgerSMB::Admin
-
 # Build time variables
-ENV LSMB_VERSION 1.5.0-beta4
+ENV LSMB_VERSION 1.4.30
 
 # 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" \
@@ -67,16 +63,20 @@ ENV SSMTP_FROMLINE_OVERRIDE YES
 
 ENV POSTGRES_HOST postgres
 
-COPY start.sh /usr/local/bin/start.sh
+COPY start.sh /usr/bin/start.sh
-COPY update_ssmtp.sh /usr/local/bin/update_ssmtp.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/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
+  chmod +x /usr/bin/update_ssmtp.sh /usr/bin/start.sh && \
   mkdir -p /var/www
 
-# Not sure why this is not set correctly, and also why
+# Work around an aufs bug related to directory permissions:
-# it gets overridden here -- moved to start.sh.
+RUN mkdir -p /tmp && \
-# ENV PERL5LIB /usr/local/lib/perl5/site_perl/5.22.0
+  chmod 1777 /tmp
 
 # Internal Port Expose
 EXPOSE 5000

start.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 update_ssmtp.sh
-cd /srv/ledgersmb
+
 
 if [[ ! -f ledgersmb.conf ]]; then
-  cp conf/ledgersmb.conf.default ledgersmb.conf
+  cp ledgersmb.conf.default ledgersmb.conf
   sed -i \
     -e "s/\(cache_templates = \).*\$/cache_templates = 1/g" \
     -e "s/\(host = \).*\$/\1$POSTGRES_HOST/g" \
@@ -13,20 +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
-for PerlLib in /usr/lib/perl5* /usr/local/lib/perl5*/site_perl/* ; do
-    [[ -d "$PerlLib" ]] && {
-        PERL5LIB="$PerlLib";
-        echo -e "\tmaybe: $PerlLib";
-    }
-done ;
-echo "Selected PERL5LIB=$PERL5LIB";
-
 # start ledgersmb
 exec starman tools/starman.psgi