prep for nonempty pp
Some checks are pending
Test / build (push) Waiting to run

This commit is contained in:
finn 2024-07-07 13:16:12 -07:00
parent e47ee47b55
commit dd21568531
4 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,5 @@
# Build ARG GPG_PP. May still need to be empty to avoid breakage.
BUILD_GPG_PP=
# Mandatory: Server address of the SMTP server to use. # Mandatory: Server address of the SMTP server to use.
SMTP_SERVER=127.0.0.1 SMTP_SERVER=127.0.0.1

View File

@ -12,11 +12,13 @@ RUN apk update && \
sed -i -e 's/inet_interfaces = localhost/inet_interfaces = all/g' /etc/postfix/main.cf sed -i -e 's/inet_interfaces = localhost/inet_interfaces = all/g' /etc/postfix/main.cf
# Gpg for pass/pmb # Gpg for pass/pmb
ARG GPG_PP=""
RUN echo "@@@@@@@@@@@@@@@@@@@@ Passphrase:"${GPG_PP}
RUN mkdir /root/.gnupg RUN mkdir /root/.gnupg
#RUN echo "default-cache-ttl 34560000" >> /root/.gnupg/gpg-agent.conf #RUN echo "default-cache-ttl 34560000" >> /root/.gnupg/gpg-agent.conf
#RUN echo "max-cache-ttl 34560000" >> /root/.gnupg/gpg-agent.conf #RUN echo "max-cache-ttl 34560000" >> /root/.gnupg/gpg-agent.conf
RUN gpg-agent --daemon --batch --disable-scdaemon RUN gpg-agent --daemon --batch --disable-scdaemon
RUN gpg --quick-gen-key --batch --passphrase '' pmbkey RUN gpg --quick-gen-key --batch --passphrase "${GPG_PP}" pmbkey
RUN pass init pmbkey RUN pass init pmbkey
COPY dotmsmtprc /root/.msmtprc COPY dotmsmtprc /root/.msmtprc

View File

@ -15,6 +15,7 @@ Build only seems to require `#usermod -aG docker username`. Not tested as root/
By default, `bridge` runs in non-interactive mode on container startup. You must set up the bridge initially: By default, `bridge` runs in non-interactive mode on container startup. You must set up the bridge initially:
cp .env.example .env cp .env.example .env
vi .env
docker-compose build docker-compose build
docker-compose up -d docker-compose up -d
docker-compose exec pmb bash docker-compose exec pmb bash

View File

@ -2,12 +2,16 @@ version: '2'
services: services:
pmb: pmb:
build: build:
args:
GPG_PP: $BUILD_GPG_PP
#context: pmb-pf if git clone into existing dc dir
context: . context: .
dockerfile: Dockerfile dockerfile: Dockerfile
#image: juanluisbaptiste/postfix:latest #image: juanluisbaptiste/postfix:latest
expose: expose:
- "25" - "25"
env_file: env_file:
#- pmb-pf/.env
- .env - .env
restart: always restart: always
volumes: volumes: