* Add 1.7 dependency available in Stretch

Adjust plackup arguments for includes

Dockerfile

@@ -1,53 +1,101 @@
-FROM        perl:5
+FROM        debian:stretch
 MAINTAINER  Freelock john@freelock.com
 
-# Build time variables
-ENV LSMB_VERSION 1.4.24
-
-
 # Install Perl, Tex, Starman, psql client, and all dependencies
-RUN DEBIAN_FRONTENT=noninteractive && \
-  apt-get update && apt-get -y install \
-  git \
-  libdatetime-perl libdbi-perl libdbd-pg-perl \
-  libcgi-simple-perl libtemplate-perl libmime-lite-perl \
-  liblocale-maketext-lexicon-perl libtest-exception-perl \
-  libtest-trap-perl liblog-log4perl-perl libmath-bigint-gmp-perl \
-  libfile-mimeinfo-perl libtemplate-plugin-number-format-perl \
-  libdatetime-format-strptime-perl libconfig-general-perl \
-  libdatetime-format-strptime-perl libio-stringy-perl libmoose-perl \
-  libconfig-inifiles-perl libnamespace-autoclean-perl \
-  libcarp-always-perl libjson-perl \
-  libtemplate-plugin-latex-perl texlive-latex-recommended \
-  texlive-latex-base texlive-latex-extra \
-  libxml-twig-perl \
-  libtex-encode-perl \
-  libdevel-trace-perl \
-  starman \
-  postgresql-client-9.4 \
-  ssmtp
+#
+# Without libclass-c3-xs-perl, everything grinds to a halt;
+# add it, because it's a 'recommends' it the dep tree, which
+# we're skipping, normally
+#
+# 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 LedgerSMB
+RUN echo "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";" > /etc/apt/apt.conf.d/00recommends && \
+  DEBIAN_FRONTEND="noninteractive" apt-mark hold sensible-utils && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y install \
+    wget ca-certificates gnupg \
+    libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
+    libdbd-pg-perl libdbi-perl libdata-uuid-perl libdatetime-perl \
+    libdatetime-format-strptime-perl libio-stringy-perl \
+    libjson-xs-perl libcpanel-json-xs-perl liblist-moreutils-perl \
+    liblocale-maketext-perl liblocale-maketext-lexicon-perl \
+    liblog-log4perl-perl libmime-lite-perl libmime-types-perl \
+    libmath-bigint-gmp-perl libmodule-runtime-perl libmoose-perl \
+    libmoosex-nonmoose-perl libnumber-format-perl \
+    libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
+    libpgobject-type-bigfloat-perl libpgobject-type-datetime-perl \
+    libpgobject-type-bytestring-perl libpgobject-util-dbmethod-perl \
+    libpgobject-util-dbadmin-perl libplack-perl libfile-find-rule-perl \
+    libplack-middleware-reverseproxy-perl \
+    libtemplate-perl libtext-csv-perl libtext-csv-xs-perl \
+    libtext-markdown-perl libxml-simple-perl \
+    libnamespace-autoclean-perl \
+    libimage-size-perl \
+    libtemplate-plugin-latex-perl libtex-encode-perl \
+    libclass-c3-xs-perl \
+    texlive-latex-recommended \
+    texlive-xetex fonts-liberation \
+    starman \
+    libopenoffice-oodoc-perl \
+    ssmtp \
+    lsb-release && \
+  echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
+  (wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -) && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove && \
+  DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean && \
+  rm -rf /var/lib/apt/lists/*
 
-RUN cd /srv && \
-  git clone https://github.com/ledgersmb/LedgerSMB.git ledgersmb
 
-WORKDIR /srv/ledgersmb
+# Build time variables
+ENV LSMB_VERSION 1.7.0-alpha1
+ENV NODE_PATH /usr/local/lib/node_modules
 
-RUN git checkout $LSMB_VERSION
 
-#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 && \
+###########################################################
+# Java & Nodejs for doing Dojo build
+# Uglify needs to be installed right before 'make dojo'?!
+
+# These packages are only needed during the dojo build
+ENV DOJO_Build_Deps git make gcc libperl-dev curl nodejs
+# These packages can be removed after the dojo build
+ENV DOJO_Build_Deps_removal ${DOJO_Build_Deps} nodejs
+
+RUN wget --quiet -O - https://deb.nodesource.com/setup_8.x | bash -
+RUN DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
+    DEBIAN_FRONTEND="noninteractive" apt-get -y install ${DOJO_Build_Deps} && \
+    cd /srv && \
+    git clone --recursive -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb && \
+    cd ledgersmb && \
+    (curl -L https://cpanmin.us | perl - App::cpanminus) && \
+    cpanm --quiet --notest \
+      --with-feature=starman \
+      --with-feature=latex-pdf-ps \
+      --with-feature=openoffice \
+      --installdeps .  && \
+    npm install uglify-js@">=2.0 <3.0" && \
+    make dojo && \
+    DEBIAN_FRONTEND="noninteractive" apt-get -y purge ${DOJO_Build_Deps_removal} && \
+    rm -rf /usr/local/lib/node_modules && \
+    DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove && \
+    DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean && \
+    rm -rf ~/.cpanm && \
+    rm -rf /var/lib/apt/lists/*
+
+# Cleanup args that are for internal use
+ENV DOJO_Build_Deps=
+ENV DOJO_Build_Deps_removal=
+ENV NODE_PATH=
 
 # 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
@@ -55,16 +103,14 @@ ENV SSMTP_FROMLINE_OVERRIDE YES
 #ENV SSMTP_AUTH_METHOD
 
 ENV POSTGRES_HOST postgres
+ENV POSTGRES_PORT 5432
+ENV DEFAULT_DB lsmb
 
-COPY start.sh /usr/bin/start.sh
-COPY update_ssmtp.sh /usr/bin/update_ssmtp.sh
-
-#RUN  cpanm \
-#   CGI::Compile
-
+COPY start.sh /usr/local/bin/start.sh
+COPY update_ssmtp.sh /usr/local/bin/update_ssmtp.sh
 
 RUN chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
-  chmod +x /usr/bin/update_ssmtp.sh /usr/bin/start.sh && \
+  chmod +x /usr/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
   mkdir -p /var/www
 
 # Work around an aufs bug related to directory permissions:
@@ -72,7 +118,7 @@ RUN mkdir -p /tmp && \
   chmod 1777 /tmp
 
 # Internal Port Expose
-EXPOSE 5000
-#USER www-data
+EXPOSE 5762
 
+USER www-data
 CMD ["start.sh"]

README.md

@@ -1,111 +1,187 @@
-# ledgersmb-docker - EXPERIMENTAL
+# ledgersmb-docker
 Dockerfile for LedgerSMB Docker image
 
-This is a work in progress to make a docker image for running LedgerSMB. It should not be relied upon for production use!
+# Supported tags
 
-# Supported tags and respective `Dockerfile` links
-
--	`1.5`, `dev-master` - Master branch, unstable
-- `1.4`, `latest` - Tip of git 1.4 branch
-- `1.3` - Latest 1.3.x release
+- `1.5`, `1.5.x`, `latest` - Latest release tarball from 1.5 branch
+- `1.4`, `1.4.x` - Latest tagged release of git 1.4 branch
+- `master` - Master branch from git, unstable
+- `master-dev`, `1.5-dev` - Containers to kick off a development setup
 
 
 # What is LedgerSMB?
-The LedgerSMB project's priority is to provide an extremely capable yet user-friendly accounting and ERP solution to small to mid-size businesses in all locales where there is interest in using the software. The focus on small to mid-size businesses offers an opportunity to provide a positive user experience in ways which are not present in larger organizations. LedgerSMB ought to strive to be both the ideal SMB accounting/ERP package and also a solution that a start-up will never outgrow. The goals mentioned above will help us provide this ideal solution by allowing us to focus both on technical architecture and on user experience.
+
+LedgerSMB is a user-friendly accounting and ERP solution for small to
+mid-size businesses. It comes with support for many languages and support
+for different locales.
+
+The project aims to be the solution a start-up never outgrows.
 
 
 # How is this image designed to be used?
 
-This Docker image is built to provide a self-contained LedgerSMB instance. To be functional, you need to connect it to a running Postgres installation. The official Postgres container will work as is, if you link it to the LedgerSMB instance at startup, or you can provide environment variables to an appropriate Postgres server.
+This image is designed to be used in conjunction with a running PostgreSQL
+instance (such as may be provided through a separate image).
 
-LedgerSMB provides an http interface built on Starman out of the box, listening on port 5000. We do not recommend exposing this port, because we strongly recommend encrypting all connections using SSL/TLS. For production use, we recommend running a web server configured with SSL, such as Nginx or Apache, and proxying connections to LedgerSMB.
+This image exposes port 5762 running a Starman HTTP application server. We
+do not recommend exposing this port publicly, because
 
-The other services you will need to put this in production are an SMTP gateway (set environment variables for SSMTP at container startup) and optionally a local print server (e.g. CUPS) installation. The print service is not currently supported in this Docker image, but pull requests are welcomed ;-)
+1. The Starman author recommends it
+2. We strongly recommend TLS encryption of all application traffic
 
+While the exposed port can be used for quick evaluation, it's recommended
+to add the TLS layer by applying Nginx or Apache as reverse proxy.
+
+Enabling optional functionalities such as outgoing e-mail and printing
+could require additional setup of a mail service or CUPS printer service.
 
 # How to use this image
 
-## Start a postgres instance
+This image can be installed either automatically with the Docker compose file
+manually with docker only.
 
-	docker run --name some-postgres -e POSTGRES_PASSWORD=mysecretpassword -d postgres
+## Docker-Compose installation and start
 
-This image includes `EXPOSE 5432` (the postgres port), so standard container linking will make it automatically available to the linked containers. The default `postgres` user and database are created in the entrypoint with `initdb`.
+This image provides `docker-compose.yml` which can be used to pull related
+images, install them, establish an internal network for their communications,
+adjust environment variables, start and stop LedgerSMB. The only instructions
+required, after the optional edition of the file to adjust the environment
+variables, are:
 
-> The postgres database is a default database meant for use by users, utilities and third party applications.  
-> [postgresql.org/docs](http://www.postgresql.org/docs/9.3/interactive/app-initdb.html)
+```plain
+ $ docker-compose pull
+ $ docker-compose up
+```
 
-## Start LedgerSMB
 
-	docker run --name myledger --link some-postgres:postgres -d ledgersmb/ledgersmb
+## Manual installation
 
-## Set up LedgerSMB
+### Start a postgres instance
 
-Visit http://myledger:5000/setup.pl (you can forward port 5000 to the host machine, or lookup the IP address for the "myledger" container if running on localhost)
+```plain
+ $ docker run -d --name postgres \
+              -e POSTGRES_PASSWORD=mysecretpassword \
+              postgres:latest
+```
 
-Log in with the "postgres" user and the password you set when starting up the Postgres container, and provide the name of a company database you want to create.
+BEWARE: The command above creates a container with the database data stored
+*inside* the container. Upon removal of the container, the database data will
+be removed too!
 
-Once you have completed the setup, you have a fully functional LedgerSMB instance running!
+To prevent destruction of the database data upon replacement of the container,
+please use these commands instead:
 
-Visit http://localhost:5000/login.pl to log in and get started.
+```plain
+ $ docker volume create dbdata
+ $ docker run -d --name postgres \
+              -e POSTGRES_PASSWORD=mysecretpassword \
+              -e PGDATA=/var/lib/postgresql/data/pgdata \
+              -v dbdata:/var/lib/postgresql/data \
+              postgres:latest
+```
+
+### Start LedgerSMB
+
+```plain
+ $ docker run -d -p 5762:5762 --name myledger \
+              ledgersmb/ledgersmb:latest
+```
+
+This command maps port 5762 of your container to port 5762 in your host. The
+web application inside the container should now be accessible through
+http://localhost:5762/setup.pl.
+
+# Set up LedgerSMB
+
+ * Visit http://myledger:5762/setup.pl.
+ * Log in with the "postgres" user and the password `mysecretpassword`
+   and provide the name of a company (= database name) you want to create.
+ * Go over the steps presented in the browser
+
+Once you have completed the setup steps, you have a fully functional
+LedgerSMB instance running!
+
+Visit http://localhost:5762/login.pl to log in and get started.
 
 # Updating the LedgerSMB container
 
-No persistant data is stored in the LedgerSMB container. All LedgerSMB data is stored in Postgres, so you can stop/destroy/run a new LedgerSMB container, and as long as you link it to the Postgres database, you should be able to pick up where you left off.
+No persistant data is stored in the LedgerSMB container.
+
+All LedgerSMB data is stored in Postgres, so you can stop/destroy/run a
+new LedgerSMB container as often as you want.
 
 # Environment Variables
 
-The LedgerSMB image uses several environment variables which are easy to miss. While none of the variables are required, they may significantly aid you in using the image.
+The LedgerSMB image uses several environment variables. They are all optional.
 
-### `POSTGRES_HOST` = 'postgres'
 
-This environment variable is used to specify the hostname of the Postgres server. The default is "postgres", which will find the container linked in.
+## `POSTGRES_HOST`
 
-If you set this to another hostname, LedgerSMB will attempt to connect to that hostname instead.
+Default: postgres
 
-### `SSMTP_ROOT` `SSMTP_MAILHUB` `SSMTP_HOSTNAME` `SSMTP_USE_STARTTLS` `SSMTP_AUTH_USER` `SSMTP_AUTH_PASS` `SSMTP_METHOD` `SSMTP_FROMLINE_OVERRIDE`
+Specifies the hostname of the PostgreSQL server to connect to. If you use
+a PostgreSQL image, set it to the name of that image.
 
-These variables are used to set outgoing SMTP defaults. To set the outgoing email address, set SSMTP_ROOT, and SSMTP_HOSTNAME at a minimum -- SSMTP_MAILHUB defaults to the default docker0 interface, so if your host is already configured to relay mail, this should relay successfully with only those two set.
+## `POSTGRES_PORT`
 
-Use the other environment variables to relay mail through another host.
+Default: 5432
 
-### `CREATE_DATABASE` `POSTGRES_PASS`
+Port on which the PostgreSQL server is running.
 
-If `CREATE_DATABASE` is set, the tools/dbsetup.pl is called with the database name, and the postgres host and password. Currently this is failing with 'Can't locate object method "process_roles" via package "LedgerSMB::Database" at tools/dbsetup.pl line 203.'
+## `DEFAULT_DB`
 
-Once this is working, this will provision a new database in the existing server. After the first run, we recommend stopping/removing the LedgerSMB container and starting a new one without these variables -- the previous database should remain present.
+Default: lsmb
+
+Set this if you want to automatically log in to a particular LedgerSMB database
+without needing to enter the name of that database on the login.pl login screen.
+
+## `LSMB_WORKERS`
+
+Default: 5
+
+Set this if you want to run in a memory-constrained environment. E.g. set it to
+2 when running in a 1 GB memory setup. Please do note that this may adversely
+affect the performance experience of users.
+
+## Mail configuration
+
+* `SSMTP_ROOT` (config: `Root`)
+* `SSMTP_MAILHUB` (config: `Mailhub`)
+* `SSMTP_HOSTNAME` (config: `Hostname`)
+* `SSMTP_USE_STARTTLS` (config: `UseSTARTTLS`)
+* `SSMTP_AUTH_USER` (config: `AuthUser`)
+* `SSMTP_AUTH_PASS` (config: `AuthPass`)
+* `SSMTP_AUTH_METHOD` (config: `AuthMethod`)
+* `SSMTP_FROMLINE_OVERRIDE` (config: `FromLineOverride`)
+
+These variables are used to set outgoing SMTP defaults.
+
+To set the outgoing email address, set `SSMTP_ROOT` and `SSMTP_HOSTNAME` at
+a minimum.
+
+`SSMTP_MAILHUB` defaults to the default docker0 interface, so if your host is
+already configured to relay mail, this should relay successfully with only
+the root and hostname set.
+
+Use the other environment variables to relay mail through a different host.
+Use the [ssmtp.conf man
+page](https://www.systutorials.com/docs/linux/man/5-ssmtp.conf/) to look up
+the meaning and function of each of the mail configuration keys.
 
 # Troubleshooting/Developing
 
-You can connect to a running container using:
+Currently the LedgerSMB installation is in /srv/ledgersmb
+and the startup & config script is /usr/bin/start.sh.
 
-> docker exec -ti myledger /bin/bash
-
-... this will give you a shell inside the container where you can inspect/troubleshoot the installation.
-
-Currently the LedgerSMB installation is in /srv/ledgersmb, and the startup/config script is /usr/bin/start.sh.
-
-
-# Supported Docker versions
-
-This image is officially supported on Docker version 1.7.0.
-
-Support for older versions is provided on a best-effort basis.
 
 # User Feedback
 
-## Documentation
-
-This is a brand new effort, and we will be adding documentation to the http://ledgersmb.org site when we get a chance.
-
 ## Issues
 
 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 [Riot.im](https://riot.im/app/#/room/#ledgersmb:matrix.org) Matrix client is highly recommended.
 
-1.4/latest: CREATE_DATABASE env variable currently does not provision a test company.
-
-1.5/dev-master: Currently no way to get a working database. Bugs are filed, blocking 3 different approaches: New database, Upgrade from 1.4, Test company
 
 ## Contributing
 

docker-compose.yml

@@ -0,0 +1,72 @@
+# This docker-compose file creates one
+# compose 'project' consisting of two containers
+#
+#  1. The PostgreSQL data  container
+#  2. The LedgerSMB application container
+#
+# LedgerSMB persists all its data in the database,
+# so no special care needs to be taken on
+# container upgrades.  With PostgreSQL, data is
+# persisted across upgrades by the use of a
+# special 'dbdata' volume
+
+version: "3.2"
+services:
+  # Note that the container needs to be named "postgres" here,
+  # because that allows us to use the default hostname ("postgres")
+  # from the LedgerSMB configuration
+  postgres:
+    image: postgres:9.6-alpine
+    environment:
+      # Replace the password below for a secure setup
+      POSTGRES_PASSWORD: abc
+      PGDATA: /var/lib/postgresql/data/pgdata
+    networks:
+      - internal
+    volumes:
+      - "pgdata:/var/lib/postgresql/data"
+  lsmb:
+    depends_on:
+      - postgres
+    image: ledgersmb/ledgersmb:1.6
+    networks:
+      - internal
+      - default
+    # Uncomment the 'ports' section to map the LedgerSMB container port (5762)
+    #  to the host's port of the same number, thus making LedgerSMB
+    #  available on http://<host-dns-or-ip>:5762/
+    #     SECURITY NOTE: Do this for evaluation purposes only!
+    #       In production, be sure to use SSL/TLS to protect user's passwords
+    #       and other sensitive data
+    # ports:
+    #   - "5762:5762"
+    environment:
+      # The LSMB_WORKERS environment variable lets you select the number
+      # of processes serving HTTP requests. The default number of 2 workers
+      # is geared toward limited-memory situations (1 GB). In order to
+      # improve the performance experience, increase memory and the
+      # number of workers
+      #
+      LSMB_WORKERS: 2
+      #
+      #
+      # SSMTP_ROOT:
+      # SSMTP_HOSTNAME:
+      # SSMTP_MAILHUB:
+      # SSMTP_AUTH_USER:
+      # SSMTP_AUTH_PASS:
+      # SSMTP_AUTH_METHOD:
+      # SSMTP_USE_STARTTLS:
+      # SSMTP_FROMLINE_OVERRIDE:
+
+# having the dbdata volume is required to persist our
+# data between PostgreSQL container updates; without
+# that, the data is contained in the same volume as
+# the rest of the image and on update/upgrade, the
+# data will be lost.
+volumes:
+  pgdata:
+
+
+networks:
+  internal:

start.sh

@@ -1,23 +1,36 @@
 #!/bin/bash
 
 update_ssmtp.sh
-
+cd /srv/ledgersmb
 
 if [[ ! -f ledgersmb.conf ]]; then
-  cp ledgersmb.conf.default ledgersmb.conf
-  sed -i \
-    -e "s/\(cache_templates = \).*\$/cache_templates = 1/g" \
-    -e "s/\(host = \).*\$/\1$POSTGRES_HOST/g" \
-    -e "s%\(sendmail   = \).*%\1/usr/bin/ssmtp%g" \
-    /srv/ledgersmb/ledgersmb.conf
+  cat <<EOF >/tmp/ledgersmb.conf
+[main]
+cache_templates = 1
+
+[database]
+host = $POSTGRES_HOST
+port = $POSTGRES_PORT
+default_db = $DEFAULT_DB
+
+[mail]
+sendmail   = /usr/sbin/ssmtp
+
+EOF
+  export LSMB_CONFIG_FILE='/tmp/ledgersmb.conf'
 fi
 
-if [ ! -z ${CREATE_DATABASE+x} ]; then
-  perl tools/prepare-company-database.pl --company $CREATE_DATABASE \
-  --host $POSTGRES_HOST \
-  --owner postgres \
-  --password "$POSTGRES_PASS"
-fi
+# Currently unmaintained/untested
+# if [ ! -z ${CREATE_DATABASE+x} ]; then
+#   perl tools/dbsetup.pl --company $CREATE_DATABASE \
+#   --host $POSTGRES_HOST \
+#   --postgres_password "$POSTGRES_PASS"
+#fi
 
 # start ledgersmb
-exec starman tools/starman.psgi
+# --preload-app allows application initialization to kill the entire
+# starman instance (instead of just the worker, which will immediately
+# get restarted); it also has a positive effect on memory use
+
+exec starman --port 5762 --workers ${LSMB_WORKERS:-5} -I lib -I old/lib \
+             --preload-app bin/ledgersmb-server.psgi