* Bring master in line with 1.5 (syntax-wise)

This commit is contained in:
Erik Huelsmann 2018-02-14 20:35:37 +01:00
parent 1d4430ecfa
commit cd3d2f573d

View File

@ -15,32 +15,32 @@ RUN echo "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";"
DEBIAN_FRONTEND="noninteractive" apt-get -y update && \ DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade && \ DEBIAN_FRONTEND="noninteractive" apt-get -y upgrade && \
DEBIAN_FRONTEND="noninteractive" apt-get -y install \ DEBIAN_FRONTEND="noninteractive" apt-get -y install \
wget ca-certificates \ wget ca-certificates \
libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \ libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
libdbd-pg-perl libdbi-perl libdatetime-perl \ libdbd-pg-perl libdbi-perl libdatetime-perl \
libdatetime-format-strptime-perl libdigest-md5-perl \ libdatetime-format-strptime-perl libdigest-md5-perl \
libfile-mimeinfo-perl libjson-xs-perl libjson-perl \ libfile-mimeinfo-perl libjson-xs-perl libjson-perl \
liblocale-maketext-perl liblocale-maketext-lexicon-perl \ liblocale-maketext-perl liblocale-maketext-lexicon-perl \
liblog-log4perl-perl libmime-base64-perl libmime-lite-perl \ liblog-log4perl-perl libmime-base64-perl libmime-lite-perl \
libmath-bigint-gmp-perl libmoose-perl libnumber-format-perl \ libmath-bigint-gmp-perl libmoose-perl libnumber-format-perl \
libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \ libpgobject-perl libpgobject-simple-perl libpgobject-simple-role-perl \
libpgobject-util-dbmethod-perl libplack-perl libtemplate-perl \ libpgobject-util-dbmethod-perl libplack-perl libtemplate-perl \
libnamespace-autoclean-perl \ libnamespace-autoclean-perl \
libtemplate-plugin-latex-perl libtex-encode-perl \ libtemplate-plugin-latex-perl libtex-encode-perl \
libmoosex-nonmoose-perl libclass-c3-xs-perl \ libmoosex-nonmoose-perl libclass-c3-xs-perl \
texlive-latex-recommended \ texlive-latex-recommended \
texlive-xetex \ texlive-xetex \
starman \ starman \
libopenoffice-oodoc-perl \ libopenoffice-oodoc-perl \
ssmtp \ ssmtp \
lsb-release \ lsb-release && \
&& echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list \ 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 - \ (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 update && \
&& DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client \ DEBIAN_FRONTEND="noninteractive" apt-get -y install postgresql-client && \
&& DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove \ DEBIAN_FRONTEND="noninteractive" apt-get -y autoremove && \
&& DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean \ DEBIAN_FRONTEND="noninteractive" apt-get -y autoclean && \
&& rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# Build time variables # Build time variables
@ -63,7 +63,7 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get -y update && \
cd /srv && \ cd /srv && \
git clone --recursive -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb && \ git clone --recursive -b $LSMB_VERSION https://github.com/ledgersmb/LedgerSMB.git ledgersmb && \
cd ledgersmb && \ cd ledgersmb && \
curl -L https://cpanmin.us | perl - App::cpanminus && \ (curl -L https://cpanmin.us | perl - App::cpanminus) && \
cpanm --quiet --notest \ cpanm --quiet --notest \
--with-feature=starman \ --with-feature=starman \
--with-feature=latex-pdf-ps \ --with-feature=latex-pdf-ps \