From 7bdc18ad49269e4003acd538970338119b332ee5 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 29 Aug 2023 14:12:46 +0200 Subject: [PATCH] Use gomplate in Dockerfile --- deps/common | 2 +- images/exim-relay/Dockerfile | 6 +++--- images/exim-relay/{resources => root}/etc/exim/exim.conf | 0 variables.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename images/exim-relay/{resources => root}/etc/exim/exim.conf (100%) diff --git a/deps/common b/deps/common index 23037f6..629b8a3 160000 --- a/deps/common +++ b/deps/common @@ -1 +1 @@ -Subproject commit 23037f6e67023c88dee875f5a534960613eda634 +Subproject commit 629b8a38285c6aaafcbf190d00f4716f356a95be diff --git a/images/exim-relay/Dockerfile b/images/exim-relay/Dockerfile index 90548e4..4aea48e 100644 --- a/images/exim-relay/Dockerfile +++ b/images/exim-relay/Dockerfile @@ -1,5 +1,5 @@ -FROM danielberteaud/alpine:latest -MAINTAINER Daniel Berteaud +FROM [[ .docker.repo ]][[ .docker.base_images.alpine.image ]] +MAINTAINER [[ .docker.maintainer ]] # Taken from https://github.com/devture/exim-relay # But rebased on my custom base image @@ -25,7 +25,7 @@ RUN set -eux &&\ ln -sf /dev/stderr /var/log/exim/reject && \ chmod 0755 /usr/sbin/exim -COPY resources/ / +COPY root/ / # Regardless of the permissions of the original `exim.conf` file in the build context, # ensure that the `/etc/exim/exim.conf` configuration file is not writable by the Exim user. diff --git a/images/exim-relay/resources/etc/exim/exim.conf b/images/exim-relay/root/etc/exim/exim.conf similarity index 100% rename from images/exim-relay/resources/etc/exim/exim.conf rename to images/exim-relay/root/etc/exim/exim.conf diff --git a/variables.yml b/variables.yml index 632c766..3ab317f 100644 --- a/variables.yml +++ b/variables.yml @@ -3,7 +3,7 @@ mail: relay: # The image to use - image: danielberteaud/exim-relay:latest + image: danielberteaud/exim-relay:20230829-1 # The driver (podman or docker) driver: docker