Browse Source

Used tabs for indentation in Dockerfiles

Michael Käufl 8 years ago
parent
commit
6cd97c46c5

+ 14 - 14
data/Dockerfiles/clamav/Dockerfile

@@ -6,16 +6,16 @@ ENV DEBIAN_VERSION stretch
 
 
 # initial install of av daemon
 # initial install of av daemon
 RUN echo "deb http://http.debian.net/debian/ $DEBIAN_VERSION main contrib non-free" > /etc/apt/sources.list && \
 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
 # initial update of av databases
 COPY dl_files.sh /dl_files.sh
 COPY dl_files.sh /dl_files.sh
@@ -24,13 +24,13 @@ RUN /dl_files.sh
 
 
 # permission juggling
 # permission juggling
 RUN mkdir /var/run/clamav && \
 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
 # av configuration update
 RUN sed -i 's/^Foreground .*$/Foreground true/g' /etc/clamav/clamd.conf && \
 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
 # port provision
 EXPOSE 3310
 EXPOSE 3310

+ 2 - 2
data/Dockerfiles/dovecot/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update \
 	automake \
 	automake \
 	syslog-ng \
 	syslog-ng \
 	syslog-ng-core \
 	syslog-ng-core \
-    syslog-ng-mod-redis \
+	syslog-ng-mod-redis \
 	ca-certificates \
 	ca-certificates \
 	supervisor \
 	supervisor \
 	wget \
 	wget \
@@ -88,7 +88,7 @@ RUN chmod +x /usr/local/lib/dovecot/sieve/rspamd-pipe-ham \
 
 
 RUN groupadd -g 5000 vmail \
 RUN groupadd -g 5000 vmail \
 	&& groupadd -g 401 dovecot \
 	&& groupadd -g 401 dovecot \
-    && groupadd -g 402 dovenull \
+	&& groupadd -g 402 dovenull \
 	&& useradd -g vmail -u 5000 vmail -d /var/vmail \
 	&& 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 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
 	&& useradd -c "Dovecot login user" -d /dev/null -u 402 -g dovenull -s /bin/false dovenull

+ 1 - 1
data/Dockerfiles/postfix/Dockerfile

@@ -19,7 +19,7 @@ RUN apt-get install -y --no-install-recommends supervisor \
 	postfix-pcre \
 	postfix-pcre \
 	syslog-ng \
 	syslog-ng \
 	syslog-ng-core \
 	syslog-ng-core \
-    syslog-ng-mod-redis \
+	syslog-ng-mod-redis \
 	ca-certificates \
 	ca-certificates \
 	gnupg \
 	gnupg \
 	python-gpgme \
 	python-gpgme \

+ 3 - 3
data/Dockerfiles/rspamd/Dockerfile

@@ -5,9 +5,9 @@ ENV DEBIAN_FRONTEND noninteractive
 ENV LC_ALL C
 ENV LC_ALL C
 
 
 RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \
 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
 RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local
 
 

+ 9 - 9
data/Dockerfiles/sogo/Dockerfile

@@ -14,15 +14,15 @@ RUN apt-get update \
 		supervisor \
 		supervisor \
 		mysql-client \
 		mysql-client \
 		cron \
 		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 mkdir /usr/share/doc/sogo
 RUN touch /usr/share/doc/sogo/empty.sh
 RUN touch /usr/share/doc/sogo/empty.sh