Fix grep flag

Dockerfile

@@ -1,53 +1,51 @@
-FROM        perl:5
+FROM        debian:jessie
 MAINTAINER  Freelock john@freelock.com
 
+# Build time variables
+ENV LSMB_VERSION 1.3
+
+
 # Install Perl, Tex, Starman, psql client, and all dependencies
 RUN DEBIAN_FRONTENT=noninteractive && \
   apt-get update && apt-get -y install \
-  libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
-  libdbd-pg-perl libdbi-perl libdatetime-perl \
-  libdatetime-format-strptime-perl libdigest-md5-perl \
-  libfile-mimeinfo-perl libjson-xs-perl libjson-perl \
-  liblocale-maketext-perl liblocale-maketext-lexicon-perl \
-  liblog-log4perl-perl libmime-base64-perl libmime-lite-perl \
-  libmath-bigint-gmp-perl libmoose-perl libnumber-format-perl \
-  libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
-  libpgobject-util-dbmethod-perl libplack-perl libtemplate-perl \
-  libnamespace-autoclean-perl \
-  libtemplate-plugin-latex-perl libtex-encode-perl \
-  libmoosex-nonmoose-perl \
-  texlive-latex-recommended \
-  texlive-xetex \
+  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 \
+  libnet-tclink-perl \
+  libxml-twig-perl \
   starman \
-  libopenoffice-oodoc-perl \
-  postgresql-client \
-  lpr \
+  postgresql-client-9.4 \
   ssmtp
 
-# Build time variables
-ENV LSMB_VERSION 1.5.4
-
 # Install LedgerSMB
+
 RUN cd /srv && \
-  curl -Lo ledgersmb-$LSMB_VERSION.tar.gz "http://downloads.sourceforge.net/project/ledger-smb/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz?r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Fledger-smb%2Ffiles%2FReleases%2F$LSMB_VERSION%2F&ts=1483124209&use_mirror=superb-sea2" && \
-  tar -xvzf ledgersmb-$LSMB_VERSION.tar.gz
-  # https://sourceforge.net/projects/ledger-smb/files/Releases/$LSMB_VERSION/ledgersmb-$LSMB_VERSION.tar.gz/download && \
+  git clone https://github.com/ledgersmb/LedgerSMB.git ledgersmb
 
 WORKDIR /srv/ledgersmb
 
-# 1.5 requirements
-RUN cpanm --quiet --notest \
-  --with-feature=starman \
-  --with-feature=latex-pdf-ps \
-  --with-feature=openoffice \
-  --installdeps .
+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 && \
 
 # Configure outgoing mail to use host, other run time variable defaults
 
 ## sSMTP
 ENV SSMTP_ROOT ar@example.com
-ENV SSMTP_MAILHUB 172.17.0.1
-ENV SSMTP_HOSTNAME 172.17.0.1
+ENV SSMTP_MAILHUB 172.17.42.1
+ENV SSMTP_HOSTNAME 172.17.42.1
 #ENV SSMTP_USE_STARTTLS
 #ENV SSMTP_AUTH_USER
 #ENV SSMTP_AUTH_PASS
@@ -55,24 +53,17 @@ 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/local/bin/start.sh
-COPY update_ssmtp.sh /usr/local/bin/update_ssmtp.sh
+COPY start.sh /usr/bin/start.sh
+COPY update_ssmtp.sh /usr/bin/update_ssmtp.sh
+
 
 RUN chown www-data /etc/ssmtp /etc/ssmtp/ssmtp.conf && \
-  chmod +x /usr/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
+  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 5762
-# If ledgersmb.conf does not exist, www-data user needs to be able to create it.
-RUN chown www-data /srv/ledgersmb
-USER www-data
+EXPOSE 5000
+#USER www-data
 
 CMD ["start.sh"]

README.md

@@ -5,9 +5,9 @@ This is a work in progress to make a docker image for running LedgerSMB. It shou
 
 # Supported tags and respective `Dockerfile` links
 
--	`dev-master` - Master branch from git, unstable
-- `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
+-	`1.5`, `dev-master` - Master branch, unstable
+- `1.4`, `latest` - Tip of git 1.4 branch
+- `1.3` - Latest 1.3.x release
 
 
 # What is LedgerSMB?
@@ -18,7 +18,7 @@ The LedgerSMB project's priority is to provide an extremely capable yet user-fri
 
 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.
 
-LedgerSMB provides an http interface built on Starman out of the box, listening on port 5762. 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.
+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.
 
 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 ;-)
 
@@ -40,13 +40,13 @@ This image includes `EXPOSE 5432` (the postgres port), so standard container lin
 
 ## Set up LedgerSMB
 
-Visit http://myledger:5762/setup.pl (you can forward port 5762 to the host machine, or lookup the IP address for the "myledger" container if running on localhost)
+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)
 
 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.
 
 Once you have completed the setup, you have a fully functional LedgerSMB instance running!
 
-Visit http://myledger:5762/login.pl to log in and get started.
+Visit http://localhost:5000/login.pl to log in and get started.
 
 # Updating the LedgerSMB container
 
@@ -62,20 +62,18 @@ This environment variable is used to specify the hostname of the Postgres server
 
 If you set this to another hostname, LedgerSMB will attempt to connect to that hostname instead.
 
-## `POSTGRES_PORT` = 5432
-
-Port to connect to Postgres on. Use to connect to a Postgres server running on an alternate port.
-
-## `DEFAULT_DB` = lsmb
-
-Set this if you want to automatically log in to a particular LSMB database.
-
 ### `SSMTP_ROOT` `SSMTP_MAILHUB` `SSMTP_HOSTNAME` `SSMTP_USE_STARTTLS` `SSMTP_AUTH_USER` `SSMTP_AUTH_PASS` `SSMTP_METHOD` `SSMTP_FROMLINE_OVERRIDE`
 
 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.
 
 Use the other environment variables to relay mail through another host.
 
+### `CREATE_DATABASE` `POSTGRES_PASS`
+
+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.'
+
+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.
+
 # Troubleshooting/Developing
 
 You can connect to a running container using:
@@ -89,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.11.1.
+This image is officially supported on Docker version 1.7.0.
 
 Support for older versions is provided on a best-effort basis.
 
@@ -103,8 +101,11 @@ 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), 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.
+You can also reach some of the official LedgerSMB maintainers via the `#ledgersmb` IRC channel on [Freenode](https://freenode.net).
 
+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
 

start.sh

@@ -1,35 +1,23 @@
 #!/bin/bash
 
 update_ssmtp.sh
-cd /srv/ledgersmb
+
 
 if [[ ! -f ledgersmb.conf ]]; then
-  cp conf/ledgersmb.conf.default ledgersmb.conf
+  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/\(port = \).*\$/\1$POSTGRES_PORT/g" \
-    -e "s/\(default_db = \).*\$/\1$DEFAULT_DB/g" \
-    -e "s%\(sendmail   = \).*%\1/usr/sbin/ssmtp%g" \
+    -e "s%\(sendmail   = \).*%\1/usr/bin/ssmtp%g" \
     /srv/ledgersmb/ledgersmb.conf
 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
-
-# Needed for modules loaded by cpanm
-export PERL5LIB
-for PerlLib in /usr/lib/perl5* /usr/local/lib/perl5*/site_perl/* ; do
-    [[ -d "$PerlLib" ]] && {
-        PERL5LIB="$PerlLib";
-        echo -e "\tmaybe: $PerlLib";
-    }
-done ;
-echo "Selected PERL5LIB=$PERL5LIB";
+if [ ! -z ${CREATE_DATABASE+x} ]; then
+  perl tools/prepare-company-database.pl --company $CREATE_DATABASE \
+  --host $POSTGRES_HOST \
+  --owner postgres \
+  --password "$POSTGRES_PASS"
+fi
 
 # start ledgersmb
-exec starman --port 5762 tools/starman.psgi
+exec starman tools/starman.psgi