Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
firefart committed Sep 1, 2024
1 parent 9bb9028 commit b39cf7f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM debian:12-slim as msmtp-builder
FROM debian:12-slim AS msmtp-builder

ENV MSMTP_VERSION="1.8.26"
ENV MSMTP_GPG_KEY="2F61B4828BBA779AECB3F32703A2A4AB1E32FD34"

Check warning on line 6 in Dockerfile

View workflow job for this annotation

GitHub Actions / images

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "MSMTP_GPG_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 6 in Dockerfile

View workflow job for this annotation

GitHub Actions / images

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "MSMTP_GPG_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/

Check warning on line 6 in Dockerfile

View workflow job for this annotation

GitHub Actions / images

Sensitive data should not be used in the ARG or ENV commands

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ENV "MSMTP_GPG_KEY") More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
Expand All @@ -25,7 +25,7 @@ RUN wget -O /msmtp.tar.xz -nv https://marlam.de/msmtp/releases/msmtp-${MSMTP_VER

#############################################################################

FROM perl:5.40.0 as builder
FROM perl:5.40.0 AS builder

ENV RT="5.0.7"
ENV RTIR="5.0.6"
Expand Down Expand Up @@ -70,6 +70,9 @@ RUN cd /src/rt \
# configure with all plugins and with the newly created user
&& ./configure --with-db-type=Pg --enable-gpg --enable-gd --enable-graphviz --enable-smime --enable-externalauth --with-web-user=rt --with-web-group=rt --with-rt-group=rt --with-bin-owner=rt --with-libs-owner=rt

# install https support for cpanm
RUN cpanm --no-man-pages install LWP::Protocol::https

# Install Sever::Starter without tests
# as they constanly fail with timeouts and thus break
# the build
Expand Down
10 changes: 5 additions & 5 deletions bash_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@ function check_files() {
echo "RT_SiteConfig.pm does not exist. Please see RT_SiteConfig.pm.example for an example configuration."
exit 1
fi

if [ ! -f ./msmtp/msmtp.conf ]; then
echo "./msmtp/msmtp.conf does not exist. Please see msmtp.conf.example for an example configuration."
exit 1;
fi

if [ ! -f ./nginx/certs/pub.pem ]; then
echo "./nginx/certs/pub.pem does not exist. Please see Readme.md if you want to create a self signed certificate."
exit 1
fi

if [ ! -f ./nginx/certs/priv.pem ]; then
echo "./nginx/certs/priv.pem does not exist. Please see Readme.md if you want to create a self signed certificate."
exit 1
fi

if [ ! -f ./crontab ]; then
echo "./crontab does not exist. Please see crontab.example for an example configuration."
exit 1
fi

if [ ! -f ./getmail/getmailrc ]; then
echo "./getmail/getmailrc does not exist. Please see getmailrc.example for an example configuration."
exit 1
Expand Down
2 changes: 1 addition & 1 deletion dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ awk '/^FROM / { print $2 }' ./nginx/Dockerfile | xargs -I % sh -c 'echo %; docke

docker compose pull
docker compose stop
docker compose rm -f
docker compose rm -f
docker compose build --progress=plain
docker compose up --remove-orphans

0 comments on commit b39cf7f

Please sign in to comment.