From 867f5674f9591cd39c0fc2583f01b0903d520315 Mon Sep 17 00:00:00 2001
From: John Locke <john@freelock.com>
Date: Sat, 14 May 2016 14:20:54 -0700
Subject: [PATCH] Major install changes nearing the 1.5 release candidates

---
 Dockerfile | 39 ++++++++++++---------------------------
 README.md  |  4 ++--
 2 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 57f6a01..e24c201 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,23 +21,8 @@ RUN DEBIAN_FRONTENT=noninteractive && \
   postgresql-client-9.4 \
   ssmtp
 
-# 1.5 requirements
-RUN apt-get install -y \
-    libpgobject-perl \
-    libpgobject-simple-perl \
-    libpgobject-simple-role-perl \
-    libpgobject-util-dbmethod-perl \
-    && cpanm -nq \
-    LaTeX::Driver \
-    PGObject::Type::BigFloat \
-    PGObject::Composite \
-    PGObject::Type::JSON \
-    PGObject::Type::Composite \
-    PGObject::Type::DateTime \
-    App::LedgerSMB::Admin
-
 # Build time variables
-ENV LSMB_VERSION 1.5.0-beta4
+ENV LSMB_VERSION 1.5.0-beta5
 
 # Install LedgerSMB
 RUN cd /srv && \
@@ -45,20 +30,23 @@ RUN cd /srv && \
 
 WORKDIR /srv/ledgersmb
 
-RUN git checkout $LSMB_VERSION
+RUN git checkout master
+#RUN git checkout $LSMB_VERSION
+
+# 1.5 requirements
+RUN cpanm --quiet --notest \
+  --with-feature=starman \
+  --with-feature=latex-pdf-ps \
+  --with-feature=openoffice \
+  --installdeps .
 
-#RUN sed -i \
-#  -e "s/short_open_tag = Off/short_open_tag = On/g" \
-#  -e "s/post_max_size = 8M/post_max_size = 20M/g" \
-#  -e "s!^;sendmail_path =.*\$!sendmail_path = /usr/sbin/ssmtp -t!g" \
-#  /etc/php5/fpm/php.ini && \
 
 # Configure outgoing mail to use host, other run time variable defaults
 
 ## sSMTP
 ENV SSMTP_ROOT ar@example.com
-ENV SSMTP_MAILHUB 172.17.42.1
-ENV SSMTP_HOSTNAME 172.17.42.1
+ENV SSMTP_MAILHUB 172.17.0.1
+ENV SSMTP_HOSTNAME 172.17.0.1
 #ENV SSMTP_USE_STARTTLS
 #ENV SSMTP_AUTH_USER
 #ENV SSMTP_AUTH_PASS
@@ -74,9 +62,6 @@ RUN chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
   chmod +x /usr/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
   mkdir -p /var/www
 
-# Not sure why this is not set correctly, and also why
-# it gets overridden here -- moved to start.sh.
-# ENV PERL5LIB /usr/local/lib/perl5/site_perl/5.22.0
 
 # Internal Port Expose
 EXPOSE 5000
diff --git a/README.md b/README.md
index f538d3b..20b79d6 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ Currently the LedgerSMB installation is in /srv/ledgersmb, and the startup/confi
 
 # Supported Docker versions
 
-This image is officially supported on Docker version 1.7.0.
+This image is officially supported on Docker version 1.11.1.
 
 Support for older versions is provided on a best-effort basis.
 
@@ -101,7 +101,7 @@ This is a brand new effort, and we will be adding documentation to the http://le
 
 If you have any problems with or questions about this image or LedgerSMB, please contact us on the [mailing list](http://ledgersmb.org/topic/support/mailing-lists-rss-and-nntp-feeds) or through a [GitHub issue](https://github.com/ledgersmb/ledgersmb-docker/issues).
 
-You can also reach some of the official LedgerSMB maintainers via the `#ledgersmb` IRC channel on [Freenode](https://freenode.net).
+You can also reach some of the official LedgerSMB maintainers via the `#ledgersmb` IRC channel on [Freenode](https://freenode.net), or on the bridged [Matrix](https://matrix.org) room in [#ledgersmb:matrix.org](https://matrix.to/#/#ledgersmb:matrix.org). The [Vector.im](https://vector.im/beta/#/room/#ledgersmb:matrix.org) Matrix client is highly recommended.
 
 1.4/latest: CREATE_DATABASE env variable currently does not provision a test company.