From 925c978543dd7acc88a1a4fe2c23701419cf6a80 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 7 Feb 2024 19:28:53 +0100 Subject: [PATCH] changed templates --- Dockerfile | 8 ++++++++ build-docker.sh | 26 ++++++++++++++++++++++++++ templates/emailVerification2.html | 2 +- templates/emailVerification2.txt | 2 +- templates/emailVerified.html | 2 +- templates/emailVerified.txt | 2 +- templates/emailVerifyFailed.html | 2 +- templates/emailVerifyFailed.txt | 2 +- 8 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 Dockerfile create mode 100755 build-docker.sh diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1cadf59 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,8 @@ +FROM golang:latest + +WORKDIR /app + +COPY main /app/main +COPY templates /app/templates + +CMD ["./main"] \ No newline at end of file diff --git a/build-docker.sh b/build-docker.sh new file mode 100755 index 0000000..068f1d4 --- /dev/null +++ b/build-docker.sh @@ -0,0 +1,26 @@ +DOCKER_REGISTRY_URL="dockreg.ex.umbach.dev" +DOCKER_IMAGE_NAME="zeitadler-mailerserver" + +# only allow to run this script as root +if [ "$EUID" -ne 0 ] + then echo "Please run as root" + exit +fi + +echo "Starting go build of $DOCKER_IMAGE_NAME" +go build main.go +echo "Go build finished" + +# rm images +docker image rm $DOCKER_IMAGE_NAME + +# build images +docker build -t $DOCKER_IMAGE_NAME . + +# tag images +docker image tag $DOCKER_IMAGE_NAME:latest $DOCKER_REGISTRY_URL/$DOCKER_IMAGE_NAME:latest + +# push to self-hosted docker registry +docker push $DOCKER_REGISTRY_URL/$DOCKER_IMAGE_NAME + +echo "Uploaded $DOCKER_IMAGE_NAME to $DOCKER_REGISTRY_URL" \ No newline at end of file diff --git a/templates/emailVerification2.html b/templates/emailVerification2.html index 200bf33..6677d63 100644 --- a/templates/emailVerification2.html +++ b/templates/emailVerification2.html @@ -111,7 +111,7 @@

{{.address}}

- %dsgvo% + %dsgvo% diff --git a/templates/emailVerification2.txt b/templates/emailVerification2.txt index a9b081a..6dc5417 100644 --- a/templates/emailVerification2.txt +++ b/templates/emailVerification2.txt @@ -16,4 +16,4 @@ %footer% -%dsgvo% \ No newline at end of file +%dsgvo%: https://zeitadler.de/datenschutzerklaerung \ No newline at end of file diff --git a/templates/emailVerified.html b/templates/emailVerified.html index 4ae9008..d83a004 100644 --- a/templates/emailVerified.html +++ b/templates/emailVerified.html @@ -100,7 +100,7 @@

{{.address}}

- %dsgvo% + %dsgvo% diff --git a/templates/emailVerified.txt b/templates/emailVerified.txt index e45feeb..d82cbd1 100644 --- a/templates/emailVerified.txt +++ b/templates/emailVerified.txt @@ -15,4 +15,4 @@ %footer% -%dsgvo% \ No newline at end of file +%dsgvo%: https://zeitadler.de/datenschutzerklaerung \ No newline at end of file diff --git a/templates/emailVerifyFailed.html b/templates/emailVerifyFailed.html index 198215b..ca02b8c 100644 --- a/templates/emailVerifyFailed.html +++ b/templates/emailVerifyFailed.html @@ -88,7 +88,7 @@

{{.address}}

- %dsgvo% + %dsgvo% diff --git a/templates/emailVerifyFailed.txt b/templates/emailVerifyFailed.txt index bf06a59..4126cca 100644 --- a/templates/emailVerifyFailed.txt +++ b/templates/emailVerifyFailed.txt @@ -8,4 +8,4 @@ %appointment3% {{.address}} -%dsgvo% \ No newline at end of file +%dsgvo%: https://zeitadler.de/datenschutzerklaerung \ No newline at end of file