* 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

@ -33,14 +33,14 @@ RUN echo "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";"
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 \