* Automatic Dockerfile update by release process

2025-10-14 00:00:29 -04:00 · 2019-11-15 19:23:03 +00:00 · 2019-11-02 15:59:50 +00:00 · 2019-10-18 12:22:02 +00:00 · 2019-10-04 17:17:25 +02:00 · 2019-10-04 16:57:07 +02:00
2 changed files with 19 additions and 29 deletions
--- a/24
+++ b/24
@@ -2,8 +2,8 @@ FROM        debian:stretch-slim
 MAINTAINER  Freelock john@freelock.com

 # Build time variables
-ENV LSMB_VERSION 1.6.9
-
+ARG LSMB_VERSION="1.7.3"
+ARG LSMB_DL_DIR="Releases"

 # Install Perl, Tex, Starman, psql client, and all dependencies
 # Without libclass-c3-xs-perl, performance is terribly slow...
@@ -16,6 +16,11 @@ ENV LSMB_VERSION 1.6.9
 # Installing psql client directly from instructions at https://wiki.postgresql.org/wiki/Apt
 # That mitigates issues where the PG instance is running a newer version than this container

+# for Buster, add:
+#    libhtml-escape-perl \
+#    libplack-middleware-builder-conditionals-perl \
+#    libplack-request-withencoding-perl \
+#libversion-compare-perl
 RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >> /etc/apt/apt.conf && \
  mkdir -p /usr/share/man/man1/ && \
  mkdir -p /usr/share/man/man2/ && \
@@ -28,10 +33,11 @@ RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >>
  DEBIAN_FRONTEND="noninteractive" apt-get dist-upgrade -y -q && \
  DEBIAN_FRONTEND="noninteractive" apt-get -y -q install \
    wget ca-certificates gnupg \
-    libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
+    libcgi-emulate-psgi-perl libconfig-inifiles-perl \
    libdbd-pg-perl libdbi-perl libdata-uuid-perl libdatetime-perl \
-    libdatetime-format-strptime-perl libio-stringy-perl \
-    libjson-xs-perl libcpanel-json-xs-perl liblist-moreutils-perl \
+    libdatetime-format-strptime-perl \
+    libio-stringy-perl \
+    libcpanel-json-xs-perl liblist-moreutils-perl \
    liblocale-maketext-perl liblocale-maketext-lexicon-perl \
    liblog-log4perl-perl libmime-lite-perl libmime-types-perl \
    libmath-bigint-gmp-perl libmodule-runtime-perl libmoose-perl \
@@ -42,12 +48,12 @@ RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >>
    libpgobject-util-dbadmin-perl libplack-perl \
    libplack-middleware-reverseproxy-perl \
    libtemplate-perl libtext-csv-perl libtext-csv-xs-perl \
-    libtext-markdown-perl libxml-simple-perl \
+    libtext-markdown-perl  libxml-simple-perl \
    libnamespace-autoclean-perl \
-    libimage-size-perl \
+    libfile-find-rule-perl \
    libtemplate-plugin-latex-perl libtex-encode-perl \
    libclass-c3-xs-perl libclass-accessor-lite-perl \
-    libnet-cidr-lite-perl libtest-requires-perl \
+    libnet-cidr-lite-perl \
    texlive-latex-recommended \
    texlive-xetex fonts-liberation \
    starman \
@@ -59,7 +65,7 @@ RUN echo -n "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";\n" >>
  DEBIAN_FRONTEND="noninteractive" apt-get -q -y update && \
  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install postgresql-client && \
  DEBIAN_FRONTEND="noninteractive" apt-get -q -y install git cpanminus make gcc libperl-dev && \
-  wget --quiet -O /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
+  wget --quiet -O /tmp/ledgersmb-$LSMB_VERSION.tar.gz "https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz" && \
  tar -xzf /tmp/ledgersmb-$LSMB_VERSION.tar.gz --directory /srv && \
  rm -f /tmp/ledgersmb-$LSMB_VERSION.tar.gz && \
  cpanm --notest \
--- a/start.sh
+++ b/start.sh
@@ -20,30 +20,14 @@ EOF
  export LSMB_CONFIG_FILE='/tmp/ledgersmb.conf'
 fi

-if [ ! -f "/tmp/ledgersmb" ]; then
-  mkdir /tmp/ledgersmb
+if [ ! -d "/tmp/ledgersmb" ]; then
+  mkdir -p /tmp/ledgersmb
 fi
-# Currently unmaintained/untested
-# if [ ! -z ${CREATE_DATABASE+x} ]; then
-#   perl tools/dbsetup.pl --company $CREATE_DATABASE \
-#   --host $POSTGRES_HOST \
-#   --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
 # --preload-app allows application initialization to kill the entire
 # starman instance (instead of just the worker, which will immediately
 # get restarted); it also has a positive effect on memory use

-exec starman --port 5762 --workers ${LSMB_WORKERS:-5} --preload-app bin/ledgersmb-server.psgi
+exec starman --port 5762 --workers ${LSMB_WORKERS:-5} -I lib -I old/lib \
+        --preload-app bin/ledgersmb-server.psgi
Author	SHA1	Message	Date
Erik Huelsmann	6d3b30720c	* Automatic Dockerfile update by release process	2019-11-15 19:23:03 +00:00
Erik Huelsmann	aa66d87e15	* Automatic Dockerfile update by release process	2019-11-02 15:59:50 +00:00
Erik Huelsmann	e06638b048	* Automatic Dockerfile update by release process	2019-10-18 12:22:02 +00:00
Erik Huelsmann	d71609cae1	Fix Dockerfile mentioned version	2019-10-04 17:17:25 +02:00
Erik Huelsmann	8bc4fd8583	Update source URL to look in the official releases	2019-10-04 16:57:07 +02:00
Erik Huelsmann	52fdf5b65e	Address failure to start Docker image Starman is looking for LedgerSMB::PSGI and can't find it due to missing library paths. Add -I arguments to fix it up.	2019-09-22 22:56:51 +02:00
Erik Huelsmann	29abd11efd	Revert back to Stretch because Buster misses sSMTP Note: we'll need to address this in due course in order to be able to release our next release on Buster (which supports more of our dependencies).	2019-08-28 21:27:53 +02:00
Erik Huelsmann	e9edcaf9ae	Revert back to stretch; Buster misses 'ssmtp'	2019-08-28 09:50:48 +02:00
Erik Huelsmann	3a74802fe1	Add additional dependency provided on Buster (libhtml-escape-perl)	2019-08-27 23:14:49 +02:00
Erik Huelsmann	1b9701511e	Update Dockerfile for 1.7.0	2019-08-27 23:09:20 +02:00