Updated .gitlab* files to be consistent with other projects. We now use msmtp instead of ssmtp
This commit is contained in:
parent
8391d7cb82
commit
2736d82796
@ -18,7 +18,7 @@ services:
|
|||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- if [ ! -d build-cache ]; then mkdir build-cache; fi
|
- 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
|
- HTTP_PROXY=http://proxy.dege.lan:3128 apk add git curl
|
||||||
- docker info && docker version
|
- docker info && docker version
|
||||||
# env|sort
|
# env|sort
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
x86_64:build-manifest:
|
x86_64:build-manifest:
|
||||||
stage: build-manifest
|
stage: build-manifest
|
||||||
script:
|
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}
|
- docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}
|
||||||
tags:
|
tags:
|
||||||
- docker
|
- docker
|
||||||
|
@ -4,9 +4,9 @@
|
|||||||
FROM alpine
|
FROM alpine
|
||||||
|
|
||||||
# Change to http respositories, so they we can cache the install packages
|
# 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
|
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/
|
COPY testmail /usr/local/bin/
|
||||||
|
Loading…
Reference in New Issue
Block a user