* Automatic Dockerfile update by release process

Use MetaCPAN database instead of the default.

Dockerfile

@@ -1,11 +1,11 @@
 # Build time variables
 
-ARG SRCIMAGE=debian:bookworm-slim
+ARG SRCIMAGE=debian:bullseye-slim
 
 
 FROM  $SRCIMAGE AS builder
 
-ARG LSMB_VERSION="1.11.2"
+ARG LSMB_VERSION="1.10.38"
 ARG LSMB_DL_DIR="Releases"
 ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"
 
@@ -51,7 +51,7 @@ 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.11.2"
+ARG LSMB_VERSION="1.10.38"
 ARG LSMB_DL_DIR="Releases"
 ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"
 
@@ -61,6 +61,8 @@ ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSI
 
 # 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
+# Install Locale::Codes Locale::Country Locale::Language from CPAN to suppress
+# deprecation-as-core-module warning
 
 
 COPY --from=builder /srv/derived-deps /tmp/derived-deps
@@ -84,8 +86,9 @@ RUN set -x ; \
     texlive-plain-generic texlive-latex-recommended texlive-fonts-recommended \
     texlive-xetex fonts-liberation \
     lsb-release && \
-  echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+  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 | apt-key add -) && \
+  mkdir -p /etc/apt/keyrings && \
+  wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc > /etc/apt/keyrings/postgresql.asc && \
   DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
   DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client && \
   DEBIAN_FRONTEND="noninteractive" apt-get -q -y install git cpanminus make gcc libperl-dev && \
@@ -126,9 +129,7 @@ ENV DEFAULT_DB lsmb
 COPY start.sh /usr/local/bin/start.sh
 
 RUN chmod +x /usr/local/bin/start.sh && \
-  mkdir -p /var/www && \
+  mkdir -p /var/www
-  mkdir -p /srv/ledgersmb/local/conf && \
-  chown -R www-data /srv/ledgersmb/local
 
 # Work around an aufs bug related to directory permissions:
 RUN mkdir -p /tmp && chmod 1777 /tmp

README.md

@@ -203,47 +203,6 @@ The following parameters are now supported to set mail preferences:
 
 # Advanced setup
 
-## Changing configuration
-
-The configuration file is stored in /srv/ledgersmb/local/conf/. By mounting
-that directory using a bind-mount to a location outside the container,
-configuration can be changed between container starts:
-
-```plain
- $ docker run -d -p 5762:5762 --name myledger \
-     --mount 'type=bind,src=/home/ledgersmb/conf,dst=/srv/ledgersmb/local/conf \
-     -e POSTGRES_HOST=<ip/hostname> ledgersmb/ledgersmb:latest
-```
-
-## Overriding or adding configuration
-
-By pre-creating a configuration file in the mounted configuration directory,
-the standard configuration generation process in the container can be overruled:
-
-```plain
- $ cat <<EOF > /home/ledgersmb/conf/ledgersmb.yaml
-   ... YOUR CONFIG HERE ...
- EOF
- $ docker run -d -p 5762:5762 --name myledger \
-     --mount 'type=bind,src=/home/ledgersmb/conf,dst=/srv/ledgersmb/local/conf \
-     -e POSTGRES_HOST=<ip/hostname> ledgersmb/ledgersmb:latest
-```
-
-If you do not want to completely overrule the configuration generated, but instead
-supplement the configuration, you can put incremental configuration snippets in
-files named `ledgersmb.XXX.yaml` in the same folder. E.g.:
-
-```plain
- $ cat <<EOF > /home/ledgersmb/conf/ledgersmb.001.yaml
- logging:
-   file: ledgersmb.logging
- EOF
-```
-
-[Documentation with respect to the available configuration
-keys](https://github.com/ledgersmb/LedgerSMB/blob/master/doc/conf/ledgersmb.yaml)
-is available in the LedgerSMB repository.
-
 ## Docker Compose with reverse proxy
 
 The `docker-compose-reverseproxy.yml` file shows a docker-compose setup

docker-compose.yml

@@ -16,7 +16,7 @@ services:
   # because that allows us to use the default hostname ("postgres")
   # from the LedgerSMB configuration
   postgres:
-    image: postgres:15-alpine
+    image: postgres:12-alpine
     environment:
       # Replace the password below for a secure setup
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-abc}
@@ -31,15 +31,7 @@ services:
   lsmb:
     depends_on:
       - postgres
-    image: ghcr.io/ledgersmb/ledgersmb:1.11
+    image: ghcr.io/ledgersmb/ledgersmb:1.10
-      # In order to store the configuration outside the image, allowing it to
-      # be edited between container restarts, uncomment the section below and
-      # change the 'source' to the directory where you want the configuration
-      # to be stored.
-    # volumes:
-    #   - type: bind
-    #     source: /home/ledgersmb/conf
-    #     target: /srv/ledgersmb/local/conf
     networks:
       - internal
       - default

start.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd /srv/ledgersmb
-mkdir ./local/conf/
+
 if [[ -n "$SSMTP_ROOT" ]]; then
     echo "\$SSMTP_ROOT set; parameter is deprecated and will be ignored"
     LSMB_HAVE_DEPRECATED=1
@@ -68,58 +68,27 @@ if [[ -n "$LSMB_HAVE_DEPRECATED" ]]; then
 fi
 
 
-if [[ ! -f ./local/conf/ledgersmb.yaml ]]; then
+if [[ ! -f ledgersmb.conf ]]; then
-  cat <<EOF >./local/conf/ledgersmb.yaml
+  cat <<EOF >/tmp/ledgersmb.conf
-paths:
+[main]
-  \$class: Beam::Wire
+cache_templates = 1
-  config:
+[database]
-    UI: ./UI/
+host = $POSTGRES_HOST
-    UI_cache: lsmb_templates/
+port = $POSTGRES_PORT
-
+default_db = $DEFAULT_DB
-db:
+[mail]
-  \$class: LedgerSMB::Database::Factory
+${LSMB_MAIL_SMTPHOST:+smtphost=$LSMB_MAIL_SMTPHOST
-  connect_data:
+}${LSMB_MAIL_SMTPPORT:+smtpport=$LSMB_MAIL_SMTPPORT
-    host: ${POSTGRES_HOST:-postgres}
+}${LSMB_MAIL_SMTPSENDER_HOSTNAME:+smtpsender_hostname=$LSMB_MAIL_SMTPSENDER_HOSTNAME
-    port: ${POSTGRES_PORT:-5432}
+}${LSMB_MAIL_SMTPTLS:+smtptls=$LSMB_MAIL_SMTPTLS
-
+}${LSMB_MAIL_SMTPUSER:+smtpuser=$LSMB_MAIL_SMTPUSER
-mail:
+}${LSMB_MAIL_SMTPPASS:+smtppass=$LSMB_MAIL_SMTPPASS
-  transport:
+}${LSMB_MAIL_SMTPAUTHMECH:+smtpauthmech=$LSMB_MAIL_SMTPAUTHMECH
-    \$class: LedgerSMB::Mailer::TransportSMTP
+}
-    host: $LSMB_MAIL_SMTPHOST
+[proxy]
-    port: $LSMB_MAIL_SMTPPORT
+ip=${PROXY_IP:-172.17.0.1/12}
-    helo: $LSMB_MAIL_SMTPSENDER_HOSTNAME
-    tls: $LSMB_MAIL_SMTPTLS
-
-miscellaneous:
-  \$class: Beam::Wire
-  config:
-    proxy_ip: ${PROXY_IP:-172.17.0.1/12}
-
-ui:
-  class: LedgerSMB::Template::UI
-  method: new_UI
-  lifecycle: eager
-  args:
-    cache:
-      \$ref: paths/UI_cache
-    root:
-      \$ref: paths/UI
 EOF
-
+  export LSMB_CONFIG_FILE='/tmp/ledgersmb.conf'
-  if [[ -n "" ]]
-  then
-      cat <<EOF >./local/conf/ledgersmb.000.yaml
-mail:
-  transport:
-    sasl_password: ''
-    sasl_username:
-      \$class: Authen::SASL
-      mechanism: $LSMB_MAIL_SMTPAUTHMECH
-      callback:
-        user: $LSMB_MAIL_SMTPUSER
-        pass: $LSMB_MAIL_SMTPPASS
-EOF
-  fi
 fi
 
 # start ledgersmb
@@ -127,14 +96,12 @@ fi
 # starman instance (instead of just the worker, which will immediately
 # get restarted) on error; it also has a positive effect on memory use
 
-LSMB_CONFIG_FILE=${LSMB_CONFIG_FILE:-./local/conf/ledgersmb.yaml}
-export LSMB_CONFIG_FILE
 echo '--------- LEDGERSMB CONFIGURATION:  ledgersmb.conf'
-cat ${LSMB_CONFIG_FILE}
+cat ${LSMB_CONFIG_FILE:-ledgersmb.conf}
 echo '--------- LEDGERSMB CONFIGURATION --- END'
 
 # ':5762:' suppresses an uninitialized variable warning in starman
 # the last colon means "don't connect using tls"; without it, there's a warning
-exec starman --listen 0.0.0.0:5762 --workers ${LSMB_WORKERS:-5} \
+exec starman --listen :5762: --workers ${LSMB_WORKERS:-5} \
              -I lib -I old/lib \
              --preload-app bin/ledgersmb-server.psgi