http.Dockerfile copies build output instead of making it

Makefile

@@ -0,0 +1,59 @@
+#############
+# VARIABLES #
+#############
+
+CPU_ARCH := $(shell lscpu | grep ^Architecture: | sed "s/^Architecture:[[:space:]]*\([[:alnum:][:punct:]]\+\).*/\1/")
+IMAGE_PREFIX := $(if $(filter armv7%,$(CPU_ARCH)),armv7/)
+REGISTRY_DOMAIN := git.joeac.net
+REGISTRY_USER := joeac
+MODULES := http gemini smtp
+
+
+#############
+# FUNCTIONS #
+#############
+
+container_image_name = $(REGISTRY_DOMAIN)/$(REGISTRY_USER)/$(IMAGE_PREFIX)$(module)
+
+define build_module_rule =
+.PHONY: build_$(module)
+build_$(module): $(module)
+	podman-compose build $(module)
+endef
+
+define push_module_rule =
+.PHONY: push_$(module)
+push_$(module): login_registry build_$(module)
+	podman push $(container_image_name)
+endef
+
+define make_module_rule =
+.PHONY: make_$(module)
+make_$(module): $(module)/.env
+	$(MAKE) --directory=$(module)
+endef
+
+define module_env_rule =
+$(module)/.env: .env
+	cp .env $(module)/.env
+endef
+
+
+#########
+# RULES #
+#########
+
+all: $(foreach module,$(MODULES),push_$(module))
+
+$(foreach module,$(MODULES),$(eval $(call build_module_rule)))
+$(foreach module,$(MODULES),$(eval $(call push_module_rule)))
+$(foreach module,$(MODULES),$(eval $(call make_module_rule)))
+$(foreach module,$(MODULES),$(eval $(call module_env_rule)))
+
+.PHONY: login_registry
+login_registry:
+	podman login $(REGISTRY_DOMAIN)
+
+.PHONY: clean
+clean:
+	$(foreach module,$(MODULES),$(MAKE) --directory=$(module) clean;)

gemini.Dockerfile

@@ -3,13 +3,6 @@ FROM git.joeac.net/joeac/armv7/agate:3.3.20-alpine3.23 AS agate
 FROM git.joeac.net/joeac/armv7/comitium:1.8.2-alpine3.23 AS comitium
 
 FROM alpine:3.23 AS final
-RUN mkdir -p /var/app/content
-WORKDIR /var/app
-COPY gemini/.certificates .certificates
-RUN crontab -l > crontab.tmp \
-  && echo "0 */6 * * * /usr/local/bin/comitium refresh --data /var/app/comitium-data" >> crontab.tmp \
-  && crontab crontab.tmp \
-  && rm crontab.tmp
 
 # bash is needed to run the build scripts
 # busybox-openrc provides rc-service, which runs crond
@@ -20,6 +13,14 @@ RUN rc-update add crond
 COPY --from=agate /root/.cargo/bin/agate /usr/local/bin/agate
 COPY --from=comitium /usr/local/bin/comitium /usr/local/bin/comitium
 
+RUN mkdir -p /var/app/content
+WORKDIR /var/app
+COPY gemini/.certificates .certificates
+RUN crontab -l > crontab.tmp \
+  && echo "0 */6 * * * /usr/local/bin/comitium refresh --data /var/app/comitium-data" >> crontab.tmp \
+  && crontab crontab.tmp \
+  && rm crontab.tmp
+
 COPY gemini .
 COPY common /var/common
 RUN make

http.Dockerfile

@@ -1,5 +1,4 @@
 FROM docker.io/arm32v7/nginx:1.30.3-alpine3.23
-RUN apk --update add build-base make
-RUN make --directory=http --makefile=http/Makefile
-COPY http/php /usr/share/nginx/php
-COPY http/out /usr/share/nginx/html
+RUN apk --update add php85-fpm
+WORKDIR /var/app
+COPY http/out http/php ./

http/Makefile

@@ -72,7 +72,7 @@ endef
 # RULES #
 #########
 
-all: bin/pp $(blogs) public out
+all: bin/pp prune $(blogs) public out
 
 bin/pp:
 	cd pp && $(MAKE)

smtp/Dockerfile

@@ -1,26 +1,4 @@
-FROM alpine:3.23 AS build
-
-WORKDIR /
-RUN mkdir -p /var/msmtp
-RUN apk --update --no-cache add git autoconf automake build-base gettext-dev gnutls-dev libtool make texinfo && \
-  git clone https://github.com/marlam/msmtp.git --branch msmtp-1.8.32 --single-branch --depth 1
-WORKDIR /msmtp
-RUN autoreconf -fi && \
-  ./configure && \
-  make && \
-  make install && \
-  apk del git autoconf automake build-base gettext-dev gnutls-dev libtool make texinfo
-
-FROM alpine:3.23 AS final
-RUN apk --update --no-cache add gettext
-COPY --from=build /usr/local/bin/msmtp /usr/local/bin/msmtpd /usr/local/bin/
+FROM git.joeac.net/joeac/armv7/msmtp:1.8.32-alpine3.23
 ARG LOCAL_SMTP_PORT
 EXPOSE $LOCAL_SMTP_PORT
 COPY .msmtprc ./
-
-CMD msmtpd \
-  --auth=$LOCAL_SMTP_USER,'echo $LOCAL_SMTP_PASSWORD' \
-  --command='msmtp -C .msmtprc -f %F --' \
-  --interface=0.0.0.0 \
-  --log=/var/msmtp/msmtpd.log \
-  --port=$LOCAL_SMTP_PORT