Merge remote-tracking branch 'upstream/master' into enhancement-master_reduce_number_of_layers

Conflicts:
	Dockerfile
This commit is contained in:
sbts
2017-07-09 15:56:39 +08:00
2 changed files with 16 additions and 12 deletions

View File

@@ -2,7 +2,7 @@ FROM debian:jessie
MAINTAINER Freelock john@freelock.com
# Install Perl, Tex, Starman, psql client, and all dependencies
RUN echo -e "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";\n" > /etc/apt/apt.conf && \
RUN echo -e "APT::Install-Recommends \"false\";\nAPT::Install-Suggests \"false\";\n" > /etc/apt/apt.conf.d/00recommends && \
apt-get update DEBIAN_FRONTEND="noninteractive" apt-get -y install && \
libcgi-emulate-psgi-perl libcgi-simple-perl libconfig-inifiles-perl \
libdbd-pg-perl libdbi-perl libdatetime-perl \
@@ -95,8 +95,5 @@ RUN mkdir -p /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
CMD ["start.sh"]