Merge branch 'main' of https://git.joeac.net/joeac/joeac.net

compose.yml

@@ -23,12 +23,12 @@ services:
       context: .
       dockerfile: smtp.Dockerfile
       args:
-        LOCAL_SMTP_PORT: 2500
+        LOCAL_SMTP_PORT: $LOCAL_SMTP_PORT
     env_file:
       - .env
     environment:
-      LOCAL_SMTP_PORT: 2500
-      LOCAL_SMTP_PASSWORD: smtp
+      SMTP_PORT: $LOCAL_SMTP_PORT
+      SMTP_PASSWORD: $LOCAL_SMTP_PORT
       REMOTE_SMTP_PASSWORD_FILE: /run/secrets/remote_smtp_password
     secrets:
       - remote_smtp_password

http.Dockerfile

@@ -7,6 +7,6 @@ COPY http/php-fpm.conf /etc/php85/php-fpm.d/joeac.net-http_pool.conf
 COPY http/nginx.conf /etc/nginx/nginx.conf
 CMD mkdir -p "$(dirname "$DB_PATH")" \
   && touch $DB_PATH \
-  && chmod -R o+w "$(dirname "$DB_PATH")" \
+  && chmod -R g+rw "$(dirname "$DB_PATH")" \
   && php-fpm85 \
   && nginx -g "daemon off;"

smtp.Dockerfile

@@ -1,7 +1,4 @@
 FROM git.joeac.net/joeac/armv7/msmtp:1.8.32-alpine3.23
 ARG LOCAL_SMTP_PORT
 EXPOSE $LOCAL_SMTP_PORT
-ENV SMTP_PORT=${LOCAL_SMTP_PORT} \
-  SMTP_USER=${LOCAL_SMTP_USER} \
-  SMTP_PASSWORD=${LOCAL_SMTP_PASSWORD}
 COPY smtp/.msmtprc ./