diff --git a/files/Dockerfile b/files/Dockerfile index dabfa2d..4216b4d 100644 --- a/files/Dockerfile +++ b/files/Dockerfile @@ -1,17 +1,5 @@ -FROM golang:1.9-alpine as confd +FROM eumau/debian:buster-slim LABEL maintainer "Mauro Torrez " -# confd ----------------------------------------------------------------------- -ARG CONFD_VERSION=0.16.0 -ADD https://github.com/kelseyhightower/confd/archive/v${CONFD_VERSION}.tar.gz /tmp/ -RUN apk add --no-cache bzip2 make && \ - mkdir -p /go/src/github.com/kelseyhightower/confd && \ - cd /go/src/github.com/kelseyhightower/confd && \ - tar --strip-components=1 -zxf /tmp/v${CONFD_VERSION}.tar.gz && \ - go install github.com/kelseyhightower/confd && \ - rm -rf /tmp/v${CONFD_VERSION}.tar.gz -# end confd ------------------------------------------------------------------- - -FROM debian:buster-slim ARG DEBIAN_FRONTEND=noninteractive ENV LC_ALL C ENV SUBMISSION_ENABLE= \ @@ -40,8 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && mkdir -p /ssl && chmod 700 /ssl \ && cp /etc/ssl/certs/ssl-cert-snakeoil.pem /ssl/cert.pem \ && cp /etc/ssl/private/ssl-cert-snakeoil.key /ssl/key.pem \ - && mkdir -p /etc/dovecot/local.d /etc/dovecot/sieve/{before,after} \ - && mkdir -p /etc/confd/{conf.d,templates} + && mkdir -p /etc/dovecot/local.d /etc/dovecot/sieve/{before,after} ADD 10-mail.conf \ 10-master.conf \ @@ -68,9 +55,4 @@ VOLUME /etc/dovecot /ssl /vmail EXPOSE 110/tcp 143/tcp 587/tcp 993/tcp 995/tcp 2000/tcp -COPY --from=confd /go/bin/confd /usr/local/bin/confd -ADD entrypoint.sh / -RUN chmod +x /entrypoint.sh /usr/local/bin/confd - -ENTRYPOINT /entrypoint.sh CMD dovecot -F diff --git a/files/entrypoint.sh b/files/entrypoint.sh deleted file mode 100755 index 8427536..0000000 --- a/files/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -# actualizar templates con confd -/usr/local/bin/confd -onetime -backend env -exec ${@}