* Automatic Dockerfile update by release process

Dockerfile

@@ -1,12 +1,12 @@
 # Build time variables
 
-ARG SRCIMAGE=debian:bullseye-slim
+ARG SRCIMAGE=debian:bookworm-slim
 
 
 FROM  $SRCIMAGE AS builder
 
-ARG LSMB_VERSION="1.10.22"
+ARG LSMB_VERSION="1.11.0-rc1"
-ARG LSMB_DL_DIR="Releases"
+ARG LSMB_DL_DIR="Beta Releases"
 ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"
 
 
@@ -51,8 +51,8 @@ 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.10.22"
+ARG LSMB_VERSION="1.11.0-rc1"
-ARG LSMB_DL_DIR="Releases"
+ARG LSMB_DL_DIR="Beta Releases"
 ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"
 
 
@@ -61,8 +61,6 @@ 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

README.md

@@ -5,7 +5,7 @@ Dockerfile for LedgerSMB Docker image
 # Supported tags
 
 - `1.10`, `1.10.x`, `latest` - Latest official release from the 1.10 branch
-- `1.9`, `1.9.30` - Last official release from the 1.9 branch
+- `1.9`, `1.9.x` - Latest official release from the 1.9 branch
 - `1.8`, `1.8.31` - Last official release from the 1.8 branch (End-of-Life)
 - `1.7`, `1.7.41` - Last official release from the 1.7 branch (End-of-Life)
 - `1.6`, `1.6.33` - Last official release from the 1.6 branch (End-of-Life)
@@ -202,6 +202,47 @@ 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:12-alpine
+    image: postgres:15-alpine
     environment:
       # Replace the password below for a secure setup
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-abc}
@@ -32,6 +32,14 @@ services:
     depends_on:
       - postgres
     image: ghcr.io/ledgersmb/ledgersmb:1.10
+    volumes:
+      # 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.
+      # - 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,27 +68,58 @@ if [[ -n "$LSMB_HAVE_DEPRECATED" ]]; then
 fi
 
 
-if [[ ! -f ledgersmb.conf ]]; then
+if [[ ! -f ./local/conf/ledgersmb.yaml ]]; then
-  cat <<EOF >/tmp/ledgersmb.conf
+  cat <<EOF >./local/conf/ledgersmb.yaml
-[main]
+paths:
-cache_templates = 1
+  $class: Beam::Wire
-[database]
+  config:
-host = $POSTGRES_HOST
+    UI: ./UI/
-port = $POSTGRES_PORT
+    UI_cache: lsmb_templates/
-default_db = $DEFAULT_DB
+
-[mail]
+db:
-${LSMB_MAIL_SMTPHOST:+smtphost=$LSMB_MAIL_SMTPHOST
+  $class: LedgerSMB::Database::Factory
-}${LSMB_MAIL_SMTPPORT:+smtpport=$LSMB_MAIL_SMTPPORT
+  connect_data:
-}${LSMB_MAIL_SMTPSENDER_HOSTNAME:+smtpsender_hostname=$LSMB_MAIL_SMTPSENDER_HOSTNAME
+    host: $POSTGRES_HOST
-}${LSMB_MAIL_SMTPTLS:+smtptls=$LSMB_MAIL_SMTPTLS
+    port: $POSTGRES_PORT
-}${LSMB_MAIL_SMTPUSER:+smtpuser=$LSMB_MAIL_SMTPUSER
+
-}${LSMB_MAIL_SMTPPASS:+smtppass=$LSMB_MAIL_SMTPPASS
+mail:
-}${LSMB_MAIL_SMTPAUTHMECH:+smtpauthmech=$LSMB_MAIL_SMTPAUTHMECH
+  transport:
-}
+    $class: LedgerSMB::Mailer::TransportSMTP
-[proxy]
+    host: $LSMB_MAIL_SMTPHOST
-ip=${PROXY_IP:-172.17.0.1/12}
+    port: $LSMB_MAIL_SMTPPORT
+    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