Synchronize dependencies with 1.5 branch

This commit is contained in:
John Locke 2016-05-30 09:07:08 -07:00
parent f070b9d6a6
commit 0034b44033

View File

@ -4,22 +4,25 @@ MAINTAINER Freelock john@freelock.com
# Install Perl, Tex, Starman, psql client, and all dependencies # Install Perl, Tex, Starman, psql client, and all dependencies
RUN DEBIAN_FRONTENT=noninteractive && \ RUN DEBIAN_FRONTENT=noninteractive && \
apt-get update && apt-get -y install \ apt-get update && apt-get -y install \
git \ libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
libdatetime-perl libdbi-perl libdbd-pg-perl \ libdbd-pg-perl libdbi-perl libdatetime-perl \
libcgi-simple-perl libtemplate-perl libmime-lite-perl \ libdatetime-format-strptime-perl libdigest-md5-perl \
liblocale-maketext-lexicon-perl libtest-exception-perl \ libfile-mimeinfo-perl libjson-xs-perl libjson-perl \
libtest-trap-perl liblog-log4perl-perl libmath-bigint-gmp-perl \ liblocale-maketext-perl liblocale-maketext-lexicon-perl \
libfile-mimeinfo-perl libtemplate-plugin-number-format-perl \ liblog-log4perl-perl libmime-base64-perl libmime-lite-perl \
libdatetime-format-strptime-perl libconfig-general-perl \ libmath-bigint-gmp-perl libmoose-perl libnumber-format-perl \
libdatetime-format-strptime-perl libio-stringy-perl libmoose-perl \ libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
libconfig-inifiles-perl libnamespace-autoclean-perl \ libpgobject-util-dbmethod-perl libplack-perl libtemplate-perl \
libcarp-always-perl libjson-perl \ libnamespace-autoclean-perl \
libtemplate-plugin-latex-perl texlive-latex-recommended \ libtemplate-plugin-latex-perl libtex-encode-perl \
libnet-tclink-perl \ libmoosex-nonmoose-perl \
libxml-twig-perl \ texlive-latex-recommended \
texlive-xetex \
starman \ starman \
postgresql-client-9.4 \ libopenoffice-oodoc-perl \
ssmtp postgresql-client \
ssmtp \
git
# Nodejs for doing Dojo build # Nodejs for doing Dojo build
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
@ -29,11 +32,11 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
RUN DEBIAN_FRONTENT=noninteractive && apt-get install -y openjdk-7-jre RUN DEBIAN_FRONTENT=noninteractive && apt-get install -y openjdk-7-jre
# Build time variables # Build time variables
ENV LSMB_VERSION 1.5.0-beta-5 ENV LSMB_VERSION master
# Install LedgerSMB # Install LedgerSMB
RUN cd /srv && \ RUN cd /srv && \
git clone --recursive -b master https://github.com/ledgersmb/LedgerSMB.git ledgersmb git clone --recursive -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb
WORKDIR /srv/ledgersmb WORKDIR /srv/ledgersmb
@ -68,6 +71,9 @@ 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/local/bin/update_ssmtp.sh /usr/local/bin/start.sh && \
mkdir -p /var/www mkdir -p /var/www
# Work around an aufs bug related to directory permissions:
RUN mkdir -p /tmp && \
chmod 1777 /tmp
# Internal Port Expose # Internal Port Expose
EXPOSE 5762 EXPOSE 5762