Dockerfile

@@ -5,7 +5,7 @@ ARG SRCIMAGE=debian:bookworm-slim
 
 FROM  $SRCIMAGE AS builder
 
-ARG LSMB_VERSION="1.12.7"
+ARG LSMB_VERSION="1.12.3"
 ARG LSMB_DL_DIR="Releases"
 ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"
 
@@ -51,15 +51,17 @@ LABEL org.opencontainers.image.description="LedgerSMB is a full featured double-
  the LedgerSMB project is to bring high quality ERP and accounting capabilities\
  to Small and Midsize Businesses."
 
-ARG LSMB_VERSION="1.12.7"
+ARG LSMB_VERSION="1.12.3"
 ARG LSMB_DL_DIR="Releases"
 ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"
 
 
-### PACKAGE REQUIREMENTS RATIONALE
+# Install Perl, Tex, Starman, psql client, and all dependencies
-#
+# Without libclass-c3-xs-perl, performance is terribly slow...
-# postgresql-client(from apt.postgresql.org): reduces chances running a newer server than this client
+
-# fonts-liberation: installed for compatibility with templates from 1.8 and earlier
+# 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
+
 
 COPY --from=builder /srv/derived-deps /tmp/derived-deps
 
@@ -78,10 +80,12 @@ RUN set -x ; \
   DEBIAN_FRONTEND="noninteractive" apt-get -q -y install \
     wget ca-certificates gnupg iproute2 \
     $( cat /tmp/derived-deps ) \
+    libclass-c3-xs-perl \
     texlive-plain-generic texlive-latex-recommended texlive-fonts-recommended \
     texlive-xetex fonts-liberation \
-    lsb-release postgresql-common && \
+    lsb-release && \
-  /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
+  echo "deb [signed-by=/etc/apt/keyrings/postgresql.asc] http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+  wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc > /etc/apt/keyrings/postgresql.asc && \
   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 && \
@@ -108,18 +112,18 @@ WORKDIR /srv/ledgersmb
 ## MAIL
 # '__CONTAINER_GATEWAY__' is a magic value which will be substituted
 # with the actual gateway IP address
-ENV LSMB_MAIL_SMTPHOST=__CONTAINER_GATEWAY__
+ENV LSMB_MAIL_SMTPHOST __CONTAINER_GATEWAY__
-#ENV LSMB_MAIL_SMTPPORT=25
+#ENV LSMB_MAIL_SMTPPORT 25
-#ENV LSMB_MAIL_SMTPSENDER_HOSTNAME=(container hostname)
+#ENV LSMB_MAIL_SMTPSENDER_HOSTNAME (container hostname)
-#ENV LSMB_MAIL_SMTPTLS=
+#ENV LSMB_MAIL_SMTPTLS
-#ENV LSMB_MAIL_SMTPUSER=
+#ENV LSMB_MAIL_SMTPUSER
-#ENV LSMB_MAIL_SMTPPASS=
+#ENV LSMB_MAIL_SMTPPASS
-#ENV LSMB_MAIL_SMTPAUTHMECH=
+#ENV LSMB_MAIL_SMTPAUTHMECH
 
 ## DATABASE
-ENV POSTGRES_HOST=postgres
+ENV POSTGRES_HOST postgres
-ENV POSTGRES_PORT=5432
+ENV POSTGRES_PORT 5432
-ENV DEFAULT_DB=lsmb
+ENV DEFAULT_DB lsmb
 
 COPY start.sh /usr/local/bin/start.sh
 

start.sh

@@ -68,13 +68,6 @@ if [[ -n "$LSMB_HAVE_DEPRECATED" ]]; then
 fi
 
 if [[ ! -f ./local/conf/ledgersmb.yaml ]]; then
-  if [[ "x$LSMB_MAIL_SMTPTLS" == "xyes" ]]; then
-     tls_mode=starttls
-  elif [[ "x$LSMB_MAIL_SMTPTLS" == "xraw" ]]; then
-     tls_mode=ssl
-  else
-     tls_mode=none
-  fi
   cat <<EOF >./local/conf/ledgersmb.yaml
 paths:
   \$class: Beam::Wire
@@ -91,7 +84,7 @@ db:
 mail:
   transport:
     \$class: Email::Sender::Transport::SMTP
-    ssl: $tls_mode
+    tls: $LSMB_MAIL_SMTPTLS
 
 miscellaneous:
   \$class: Beam::Wire
@@ -147,7 +140,8 @@ EOF
       cat <<EOF >./local/conf/ledgersmb.003.yaml
 mail:
   transport:
-    sasl_authenticator:
+    sasl_password: ''
+    sasl_username:
       \$class: Authen::SASL
       mechanism: $LSMB_MAIL_SMTPAUTHMECH
       callback: