Rewrite proxy Dockerfile:

* ARCH used to be hard-coded; is now set according to the architecture being built
* Build from the associated LedgerSMB base image (not from 'lsmb-split')
* More deletion of non-required files (/usr/share/doc/*)
* Fewer layers by combining RUN commands

base/Dockerfile

@@ -39,7 +39,6 @@ RUN set -x ; \
   cd /srv && \
   curl -s -o ledgersmb-installer -L https://get.ledgersmb.org/ledgersmb-installer && \
   ARTIFACT_LOCATION="$ARTIFACT_PATH" perl ledgersmb-installer install --yes --log-level=trace $LSMB_VERSION && \
-  mv /srv/ledgersmb/server-start /usr/local/bin/run.sh && \
   rm -rf ~/.cpanm/ /var/lib/apt/lists/* /usr/share/man/*
 
 WORKDIR /srv/ledgersmb
@@ -67,6 +66,7 @@ ENV DEFAULT_DB=lsmb
 
 COPY start.sh /usr/local/bin/start.sh
 COPY config.sh /usr/local/bin/config.sh
+COPY run.sh /usr/local/bin/run.sh
 
 RUN chmod +x /usr/local/bin/start.sh /usr/local/bin/config.sh /usr/local/bin/run.sh && \
   mkdir -p /var/www && \

base/run.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd /srv/ledgersmb
+
+# ':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} \
+             -I lib -I old/lib \
+             --preload-app bin/ledgersmb-server.psgi

build

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -euxo pipefail
-
-${DOCKER:-docker} buildx build \
-   --progress plain \
-   --platform ${PLATFORM:-linux/amd64,linux/arm64,linux/arm/v7} \
-   --build-arg "ARTIFACT_PATH=$ARTIFACT_PATH" \
-   -t ledgersmb/ledgersmb:$BRANCH-base \
-   -t ledgersmb/ledgersmb:$VERSION-base \
-   -t ghcr.io/ledgersmb/ledgersmb:$BRANCH-base \
-   -t ghcr.io/ledgersmb/ledgersmb:$VERSION-base \
-   ${SET_LATEST_TAG:+ -t ledgersmb/ledgersmb:latest-base -t ghcr.io/ledgersmb/ledgersmb:latest-base} \
-   --push base/
-
-${DOCKER:-docker} buildx build \
-   --progress plain \
-   --platform ${PLATFORM:-linux/amd64,linux/arm64,linux/arm/v7} \
-   -t ledgersmb/ledgersmb:$BRANCH \
-   -t ledgersmb/ledgersmb:$VERSION \
-   -t ghcr.io/ledgersmb/ledgersmb:$BRANCH \
-   -t ghcr.io/ledgersmb/ledgersmb:$VERSION \
-   ${SET_LATEST_TAG:+ -t ledgersmb/ledgersmb:latest -t ghcr.io/ledgersmb/ledgersmb:latest} \
-   --push proxy/

with-proxy/nginx.conf

@@ -40,6 +40,15 @@ http {
       access_log /dev/stdout;
       error_log /dev/stderr info;
 
+      # Don't log status polls
+      location /nginx_status {
+               stub_status on;
+               access_log off;
+               allow 127.0.0.1;
+               allow ::1;
+               deny all;
+      }
+
       # Configuration files don't exist
       location ^~ \.conf$ {
          return 404;
@@ -51,7 +60,7 @@ http {
       }
 
       location = / {
-         return 301 login.pl;
+         return 301 /login.pl;
       }
 
       # JS & CSS