From ef55ca525c1286006c5090f4c653d133557851bb Mon Sep 17 00:00:00 2001
From: Hans Cornelis <hacornelis@gmail.com>
Date: Wed, 17 Oct 2018 07:48:52 +0200
Subject: [PATCH] Deleted conflicting merge files

Signed-off-by: Hans Cornelis <hacornelis@gmail.com>
---
 core/dovecot/Dockerfile_BACKUP_7007 | 19 -------------------
 core/dovecot/Dockerfile_BASE_7007   | 14 --------------
 core/dovecot/Dockerfile_LOCAL_7007  | 14 --------------
 core/dovecot/Dockerfile_REMOTE_7007 | 15 ---------------
 4 files changed, 62 deletions(-)
 delete mode 100644 core/dovecot/Dockerfile_BACKUP_7007
 delete mode 100644 core/dovecot/Dockerfile_BASE_7007
 delete mode 100644 core/dovecot/Dockerfile_LOCAL_7007
 delete mode 100644 core/dovecot/Dockerfile_REMOTE_7007

diff --git a/core/dovecot/Dockerfile_BACKUP_7007 b/core/dovecot/Dockerfile_BACKUP_7007
deleted file mode 100644
index b5590a73..00000000
--- a/core/dovecot/Dockerfile_BACKUP_7007
+++ /dev/null
@@ -1,19 +0,0 @@
-<<<<<<< HEAD
-FROM alpine:3.7
-=======
-FROM alpine:3.8
->>>>>>> upstream/master
-
-RUN apk add --no-cache \
-     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
-     python3 py3-pip \
- && pip3 install --upgrade pip \
- && pip3 install jinja2 podop tenacity
-
-COPY conf /conf
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-VOLUME ["/data", "/mail"]
-
-CMD /start.py
\ No newline at end of file
diff --git a/core/dovecot/Dockerfile_BASE_7007 b/core/dovecot/Dockerfile_BASE_7007
deleted file mode 100644
index cacfe354..00000000
--- a/core/dovecot/Dockerfile_BASE_7007
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM alpine:edge
-
-RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --no-cache \
-     dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
-     rspamd-client@testing python py-jinja2
-
-COPY conf /conf
-COPY sieve /var/lib/dovecot
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-
-CMD /start.py
diff --git a/core/dovecot/Dockerfile_LOCAL_7007 b/core/dovecot/Dockerfile_LOCAL_7007
deleted file mode 100644
index 29957921..00000000
--- a/core/dovecot/Dockerfile_LOCAL_7007
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM alpine:3.7
-
-RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --no-cache \
-     dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
-     rspamd-client@testing python py-jinja2
-
-COPY conf /conf
-COPY sieve /var/lib/dovecot
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-
-CMD /start.py
\ No newline at end of file
diff --git a/core/dovecot/Dockerfile_REMOTE_7007 b/core/dovecot/Dockerfile_REMOTE_7007
deleted file mode 100644
index d8d4c55b..00000000
--- a/core/dovecot/Dockerfile_REMOTE_7007
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM alpine:3.8
-
-RUN apk add --no-cache \
-     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
-     python3 py3-pip \
- && pip3 install --upgrade pip \
- && pip3 install jinja2 podop tenacity
-
-COPY conf /conf
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-VOLUME ["/data", "/mail"]
-
-CMD /start.py