Compare commits

...

5 Commits

Author SHA1 Message Date
Erik Huelsmann
5168936493 * Automatic Dockerfile update by release process 2021-09-24 16:08:51 -04:00
Erik Huelsmann
49a448c732 Change PostgreSQL container version
Close #28.
2021-09-23 16:38:44 +02:00
Erik Huelsmann
27b3e40e72 * Automatic Dockerfile update by release process 2021-09-18 16:43:48 -04:00
Erik Huelsmann
6593d58698 Set the reverse proxy address to the default Docker address range 2021-09-17 23:04:21 +02:00
Erik Huelsmann
5a7ec0a2ed Add reverse proxy configuration option 2021-09-17 22:41:06 +02:00
3 changed files with 16 additions and 5 deletions

View File

@@ -5,8 +5,8 @@ ARG SRCIMAGE=debian:bullseye-slim
FROM $SRCIMAGE AS builder
ARG LSMB_VERSION="1.9.0-beta3"
ARG LSMB_DL_DIR="Beta Releases"
ARG LSMB_VERSION="1.9.0"
ARG LSMB_DL_DIR="Releases"
ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"
@@ -43,8 +43,8 @@ RUN set -x ; \
FROM $SRCIMAGE
LABEL org.opencontainers.image.authors="LedgerSMB project <devel@lists.ledgersmb.org>"
ARG LSMB_VERSION="1.9.0-beta3"
ARG LSMB_DL_DIR="Beta Releases"
ARG LSMB_VERSION="1.9.0"
ARG LSMB_DL_DIR="Releases"
ARG ARTIFACT_LOCATION="https://download.ledgersmb.org/f/$LSMB_DL_DIR/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz"

View File

@@ -16,7 +16,7 @@ services:
# because that allows us to use the default hostname ("postgres")
# from the LedgerSMB configuration
postgres:
image: postgres:9.6-alpine
image: postgres:12-alpine
environment:
# Replace the password below for a secure setup
POSTGRES_PASSWORD: abc
@@ -58,6 +58,15 @@ services:
# SSMTP_AUTH_METHOD:
# SSMTP_USE_STARTTLS:
# SSMTP_FROMLINE_OVERRIDE:
#
#
# The PROXY_IP environment variable lets you set the IP address
# (range) of the reverse proxy used for TLS termination, which forwards
# its requests to this container. When this reverse proxy runs on the
# Docker host, the default below applies. In case the reverse proxy is
# hosted in a separate container, this setting needs to be adjusted.
#
# PROXY_IP: 172.17.0.1/12
# having the dbdata volume is required to persist our
# data between PostgreSQL container updates; without

View File

@@ -85,6 +85,8 @@ ${LSMB_MAIL_SMTPHOST:+smtphost=$LSMB_MAIL_SMTPHOST
}${LSMB_MAIL_SMTPPASS:+smtppass=$LSMB_MAIL_SMTPPASS
}${LSMB_MAIL_SMTPAUTHMECH:+smtpauthmech=$LSMB_MAIL_SMTPAUTHMECH
}
[proxy]
ip=${PROXY_IP:-172.17.0.1/12}
EOF
export LSMB_CONFIG_FILE='/tmp/ledgersmb.conf'
fi