Compare commits

...

14 Commits
1.3 ... 1.4.25

Author SHA1 Message Date
John Locke
4448e9b270 Version 1.4.25 2016-02-18 13:15:50 -08:00
John Locke
3b3613dd13 Add xetex back to the container, to support pdf invoices 2016-02-14 09:53:58 -08:00
John Locke
9a789a8032 Removed missing package. 2016-02-05 13:39:17 -08:00
John Locke
d61ce704c2 Tag new 1.4 version 2016-02-05 13:36:54 -08:00
John Locke
048e003a43 Correct latex dependencies 2016-02-05 11:06:14 -08:00
John Locke
3e3915cfc9 Create 1.4.22 tag 2016-01-02 22:48:15 -08:00
John Locke
30efe577bb Fix grep flag 2015-11-19 12:01:03 -08:00
John Locke
052557897e Patch from dcg: detect /etc/ssmtp.conf changes inside update script, instead of touching a /tmp file 2015-11-19 11:59:35 -08:00
John Locke
0e50f0bada Install texlive-xetex to support xelatex 2015-11-01 09:24:48 -08:00
John Locke
d2faf23967 Try adding an explicit /tmp dir creation to work around an aufs bug 2015-09-21 09:09:17 -07:00
John Locke
ba69402221 Fix dependencies for LaTeX in Dockerfile for 1.4 -- add libtex-encode-perl, remove obsolete libnet-tclink-perl 2015-09-18 14:06:31 -07:00
John Locke
46039f99e9 Change base to Perl:5, add CGI::Compile via cpan 2015-08-28 10:24:52 -07:00
John Locke
f2a7c0ada6 Add devel-trace to image 2015-08-28 10:21:54 -07:00
John Locke
890f0c4931 Update readme for versions built 2015-08-01 10:11:35 -07:00
4 changed files with 21 additions and 11 deletions

View File

@@ -1,8 +1,8 @@
FROM debian:jessie
FROM perl:5
MAINTAINER Freelock john@freelock.com
# Build time variables
ENV LSMB_VERSION 1.4
ENV LSMB_VERSION 1.4.25
# Install Perl, Tex, Starman, psql client, and all dependencies
@@ -19,8 +19,11 @@ RUN DEBIAN_FRONTENT=noninteractive && \
libconfig-inifiles-perl libnamespace-autoclean-perl \
libcarp-always-perl libjson-perl \
libtemplate-plugin-latex-perl texlive-latex-recommended \
libnet-tclink-perl \
texlive-latex-base texlive-latex-extra \
texlive-xetex \
libxml-twig-perl \
libtex-encode-perl \
libdevel-trace-perl \
starman \
postgresql-client-9.4 \
ssmtp
@@ -57,11 +60,18 @@ ENV POSTGRES_HOST postgres
COPY start.sh /usr/bin/start.sh
COPY update_ssmtp.sh /usr/bin/update_ssmtp.sh
#RUN cpanm \
# CGI::Compile
RUN chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
chmod +x /usr/bin/update_ssmtp.sh /usr/bin/start.sh && \
mkdir -p /var/www
# Work around an aufs bug related to directory permissions:
RUN mkdir -p /tmp && \
chmod 1777 /tmp
# Internal Port Expose
EXPOSE 5000
#USER www-data

View File

@@ -7,8 +7,7 @@ This is a work in progress to make a docker image for running LedgerSMB. It shou
- `1.5`, `dev-master` - Master branch, unstable
- `1.4`, `latest` - Tip of git 1.4 branch
- `1.4.12` - Latest stable release (not yet built)
- `1.3.45` - Last 1.3.x release (not yet built)
- `1.3` - Latest 1.3.x release
# What is LedgerSMB?

View File

@@ -1,11 +1,6 @@
#!/bin/bash
if [[ -e /tmp/smtpconfig ]]; then
echo "smtp configured."
else
update_ssmtp.sh
touch /tmp/smtpconfig
fi
update_ssmtp.sh
if [[ ! -f ledgersmb.conf ]]; then

View File

@@ -1,4 +1,9 @@
#!/bin/bash
ConfiguredComment='# install script update_ssmtp.sh has configured ssmtp'
grep -qc "$ConfiguredComment" /etc/ssmtp.conf && {
echo "smtp configured."
exit
}
sed -i \
-e "s/\(root=\).*\$/\1$SSMTP_ROOT/g" \
@@ -10,3 +15,4 @@ sed -i \
[ -z "$SSMTP_AUTH_PASS" ] || echo "AuthPass=$SSMTP_AUTH_PASS" >> /etc/ssmtp/ssmtp.conf
[ -z "$SSMTP_AUTH_METHOD" ] || echo "AuthMethod=$SSMTP_AUTH_METHOD" >> /etc/ssmtp/ssmtp.conf
[ -z "$SSMTP_FROMLINE_OVERRIDE" ] || echo "FromLineOverride=$SSMTP_FROMLINE_OVERRIDE" >> /etc/ssmtp/ssmtp.conf
echo "$ConfiguredComment" >> /etc/ssmtp/ssmtp.conf