From 6cd97c46c519958436d1734aff61727ede90043b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=A4ufl?= Date: Fri, 12 May 2017 20:54:23 +0200 Subject: [PATCH] Used tabs for indentation in Dockerfiles --- data/Dockerfiles/clamav/Dockerfile | 28 ++++++++++++++-------------- data/Dockerfiles/dovecot/Dockerfile | 4 ++-- data/Dockerfiles/postfix/Dockerfile | 2 +- data/Dockerfiles/rspamd/Dockerfile | 6 +++--- data/Dockerfiles/sogo/Dockerfile | 18 +++++++++--------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/data/Dockerfiles/clamav/Dockerfile b/data/Dockerfiles/clamav/Dockerfile index 170b7d8f..26867111 100755 --- a/data/Dockerfiles/clamav/Dockerfile +++ b/data/Dockerfiles/clamav/Dockerfile @@ -6,16 +6,16 @@ ENV DEBIAN_VERSION stretch # initial install of av daemon RUN echo "deb http://http.debian.net/debian/ $DEBIAN_VERSION main contrib non-free" > /etc/apt/sources.list && \ - echo "deb http://http.debian.net/debian/ $DEBIAN_VERSION-updates main contrib non-free" >> /etc/apt/sources.list && \ - echo "deb http://security.debian.org/ $DEBIAN_VERSION/updates main contrib non-free" >> /etc/apt/sources.list && \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \ - clamav-daemon \ - clamav-freshclam \ - libclamunrar7 \ - curl && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* + echo "deb http://http.debian.net/debian/ $DEBIAN_VERSION-updates main contrib non-free" >> /etc/apt/sources.list && \ + echo "deb http://security.debian.org/ $DEBIAN_VERSION/updates main contrib non-free" >> /etc/apt/sources.list && \ + apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -qq \ + clamav-daemon \ + clamav-freshclam \ + libclamunrar7 \ + curl && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* # initial update of av databases COPY dl_files.sh /dl_files.sh @@ -24,13 +24,13 @@ RUN /dl_files.sh # permission juggling RUN mkdir /var/run/clamav && \ - chown clamav:clamav /var/run/clamav && \ - chmod 750 /var/run/clamav + chown clamav:clamav /var/run/clamav && \ + chmod 750 /var/run/clamav # av configuration update RUN sed -i 's/^Foreground .*$/Foreground true/g' /etc/clamav/clamd.conf && \ - echo "TCPSocket 3310" >> /etc/clamav/clamd.conf && \ - sed -i 's/^Foreground .*$/Foreground true/g' /etc/clamav/freshclam.conf + echo "TCPSocket 3310" >> /etc/clamav/clamd.conf && \ + sed -i 's/^Foreground .*$/Foreground true/g' /etc/clamav/freshclam.conf # port provision EXPOSE 3310 diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile index aa3ed9da..0a357855 100644 --- a/data/Dockerfiles/dovecot/Dockerfile +++ b/data/Dockerfiles/dovecot/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update \ automake \ syslog-ng \ syslog-ng-core \ - syslog-ng-mod-redis \ + syslog-ng-mod-redis \ ca-certificates \ supervisor \ wget \ @@ -88,7 +88,7 @@ RUN chmod +x /usr/local/lib/dovecot/sieve/rspamd-pipe-ham \ RUN groupadd -g 5000 vmail \ && groupadd -g 401 dovecot \ - && groupadd -g 402 dovenull \ + && groupadd -g 402 dovenull \ && useradd -g vmail -u 5000 vmail -d /var/vmail \ && useradd -c "Dovecot unprivileged user" -d /dev/null -u 401 -g dovecot -s /bin/false dovecot \ && useradd -c "Dovecot login user" -d /dev/null -u 402 -g dovenull -s /bin/false dovenull diff --git a/data/Dockerfiles/postfix/Dockerfile b/data/Dockerfiles/postfix/Dockerfile index 87c40cfb..4616ba9a 100644 --- a/data/Dockerfiles/postfix/Dockerfile +++ b/data/Dockerfiles/postfix/Dockerfile @@ -19,7 +19,7 @@ RUN apt-get install -y --no-install-recommends supervisor \ postfix-pcre \ syslog-ng \ syslog-ng-core \ - syslog-ng-mod-redis \ + syslog-ng-mod-redis \ ca-certificates \ gnupg \ python-gpgme \ diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index 2a4ff29c..5adb9dce 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -5,9 +5,9 @@ ENV DEBIAN_FRONTEND noninteractive ENV LC_ALL C RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \ - && echo "deb http://rspamd.com/apt-stable/ jessie main" > /etc/apt/sources.list.d/rspamd.list \ - && apt-get update \ - && apt-get -y install rspamd ca-certificates python-pip + && echo "deb http://rspamd.com/apt-stable/ jessie main" > /etc/apt/sources.list.d/rspamd.list \ + && apt-get update \ + && apt-get -y install rspamd ca-certificates python-pip RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local diff --git a/data/Dockerfiles/sogo/Dockerfile b/data/Dockerfiles/sogo/Dockerfile index 348231de..b1b9d249 100644 --- a/data/Dockerfiles/sogo/Dockerfile +++ b/data/Dockerfiles/sogo/Dockerfile @@ -14,15 +14,15 @@ RUN apt-get update \ supervisor \ mysql-client \ cron \ - && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ - && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ - && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ - && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ - && chmod +x /usr/local/bin/gosu \ - && gosu nobody true + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ + && export GNUPGHOME="$(mktemp -d)" \ + && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ + && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ + && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ + && chmod +x /usr/local/bin/gosu \ + && gosu nobody true RUN mkdir /usr/share/doc/sogo RUN touch /usr/share/doc/sogo/empty.sh