From 2736d827962640d692a45de7045c2ec9b17c9cee Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sat, 24 Feb 2024 21:58:47 +1100
Subject: [PATCH] Updated .gitlab* files to be consistent with other projects.
 We now use msmtp instead of ssmtp

---
 .gitlab-ci.yml              | 2 +-
 .gitlab-docker-manifest.yml | 2 +-
 Dockerfile                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d995f28..953346b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ services:
 
 before_script:
 - if [ ! -d build-cache ]; then mkdir build-cache; fi
-- sed -ie s'/https/http/' /etc/apk/repositories
+- sed -i -e s'/https/http/' /etc/apk/repositories
 - HTTP_PROXY=http://proxy.dege.lan:3128 apk add git curl
 - docker info && docker version
 # env|sort
diff --git a/.gitlab-docker-manifest.yml b/.gitlab-docker-manifest.yml
index 8b38379..1eddfc3 100644
--- a/.gitlab-docker-manifest.yml
+++ b/.gitlab-docker-manifest.yml
@@ -1,7 +1,7 @@
 x86_64:build-manifest:
   stage: build-manifest
   script:
-  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 #${CI_REGISTRY_IMAGE}:${VERSION}-arm64 ${CI_REGISTRY_IMAGE}:${VERSION}armv7l
+  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 #${CI_REGISTRY_IMAGE}:${VERSION}-arm64 ${CI_REGISTRY_IMAGE}:${VERSION}-armv7l
   - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}
   tags:
   - docker
diff --git a/Dockerfile b/Dockerfile
index 557605e..5f24d84 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,9 +4,9 @@
 FROM alpine
 
 # Change to http respositories, so they we can cache the install packages
-RUN if [ -n ${HTTP_PROXY} ] ; then sed -ie s'/https/http/' /etc/apk/repositories; fi
+RUN if [ -n ${HTTP_PROXY} ] ; then sed -i -e s'/https/http/' /etc/apk/repositories; fi
 
-RUN apk add --no-cache ssmtp
+RUN apk add --no-cache msmtp
 RUN sed -i -e 's/^mailhub=mail$/mailhub=smtp/' -e "s/^hostname=/#hostname=/" -e 's/#FromLineOverride=YES/FromLineOverride=YES/' /etc/ssmtp/ssmtp.conf
 
 COPY testmail /usr/local/bin/