Minor updates to trigger rebuild

This commit is contained in:
Deon George 2017-12-13 10:06:05 +11:00
parent aaec9fefa5
commit f4a341125f
2 changed files with 1 additions and 12 deletions

View File

@ -6,7 +6,6 @@ stages:
variables: variables:
VERSION: latest VERSION: latest
AUTO_VERSION: ${CI_COMMIT_TAG:-latest}
CACHETAG: build CACHETAG: build
DOCKER_REGISTRY: registry.leenooks.net DOCKER_REGISTRY: registry.leenooks.net
DOCKER_HOST: tcp://${DOCKER_REGISTRY}-leenooks-ci-docker:2375 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} - 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_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 "CI_REGISTRY ${CI_REGISTRY} CI_REGISTRY_IMAGE ${CI_REGISTRY_IMAGE} CI ${CI}"
- echo "AUTO_VERSION ${AUTO_VERSION}"
test: test:
stage: test stage: test

View File

@ -1,18 +1,9 @@
# NAME leenooks/rspamd # NAME leenooks/rspamd
# VERSION latest # 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 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 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
# EPEL & Leenooks packages
RUN yum -y install \
rmilter \
rspamd \
&& yum clean all
EXPOSE 11332 11333 11334 EXPOSE 11332 11333 11334