From f4a341125faa35df768ded79d04bbd69997c2098 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Wed, 13 Dec 2017 10:06:05 +1100
Subject: [PATCH] Minor updates to trigger rebuild

---
 .gitlab-ci.yml |  2 --
 Dockerfile     | 11 +----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45d3afd..47bee87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
 
 variables:
   VERSION: latest
-  AUTO_VERSION: ${CI_COMMIT_TAG:-latest}
   CACHETAG: build
   DOCKER_REGISTRY: registry.leenooks.net
   DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375
@@ -20,7 +19,6 @@ before_script:
 - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN ${DOCKER_REGISTRY}
 - echo "CI_PROJECT_PATH ${CI_PROJECT_PATH} CI_COMMIT_TAG ${CI_COMMIT_TAG} CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME}"
 - echo "CI_REGISTRY ${CI_REGISTRY} CI_REGISTRY_IMAGE ${CI_REGISTRY_IMAGE} CI ${CI}"
-- echo "AUTO_VERSION ${AUTO_VERSION}"
 
 test:
   stage: test
diff --git a/Dockerfile b/Dockerfile
index e63e00d..f7af69b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,9 @@
 # NAME leenooks/rspamd
 # VERSION latest
-# BUILD docker build -t="leenooks/rspamd" .
-# START docker run -d ...
-# CRON docker exec -it rspamd ...
 
 FROM registry.leenooks.net/leenooks/base:7.E
 
-RUN yum -y install wget && yum clean all && wget -O /etc/yum.repos.d/rspamd.repo http://rspamd.com/rpm-stable/centos-7/rspamd.repo && rpm --import http://rspamd.com/rpm-stable/gpg.key
-
-# EPEL & Leenooks packages
-RUN yum -y install \
-	rmilter \
-	rspamd \
-	&& yum clean all
+RUN curl -o /etc/yum.repos.d/rspamd.repo http://rspamd.com/rpm-stable/centos-7/rspamd.repo && rpm --import http://rspamd.com/rpm-stable/gpg.key && yum -y install rspamd && yum clean all
 
 EXPOSE 11332 11333 11334