From 96124508ad07e230c489ba6f0fb239534cbf3a0b Mon Sep 17 00:00:00 2001 From: casjay Date: Wed, 19 Jun 2024 09:37:59 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile rootfs/root/docker/setup/custom rootfs/root/docker/setup/packages --- Dockerfile | 7 +++---- rootfs/root/docker/setup/{packages => custom} | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) rename rootfs/root/docker/setup/{packages => custom} (97%) diff --git a/Dockerfile b/Dockerfile index 18f07ab..6dc2452 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,8 +22,8 @@ ARG IMAGE_REPO="casjaysdevdocker/mailman" ARG IMAGE_VERSION="latest" ARG CONTAINER_VERSION="" -ARG PULL_URL="casjaysdev/debian" -ARG DISTRO_VERSION="${IMAGE_VERSION}" +ARG PULL_URL="debian" +ARG DISTRO_VERSION="buster" ARG BUILD_VERSION="${BUILD_DATE}" FROM tianon/gosu:latest AS gosu @@ -46,8 +46,7 @@ ARG DEFAULT_TEMPLATE_DIR ARG DISTRO_VERSION ARG PHP_VERSION -ARG PACK_LIST="bash mailman3-full exim4 apache2 apache2-data apache2-utils curl \ - " +ARG PACK_LIST="bash mailman exim4 apache2 apache2-data apache2-utils curl wget tini" ENV ENV=~/.bashrc ENV SHELL="/bin/sh" diff --git a/rootfs/root/docker/setup/packages b/rootfs/root/docker/setup/custom similarity index 97% rename from rootfs/root/docker/setup/packages rename to rootfs/root/docker/setup/custom index f64e50b..b51b485 100644 --- a/rootfs/root/docker/setup/packages +++ b/rootfs/root/docker/setup/custom @@ -16,3 +16,5 @@ cp -Rf /root/docker/conf/update-exim4.conf.conf /etc/exim4/update-exim4.conf.con cp -Rf /root/docker/conf/mm_cfg.py /etc/mailman/mm_cfg.py cp -Rf /root/docker/conf/mailman.conf /etc/apache2/sites-available/ cp -Rf /root/docker/conf/aliases /etc/aliases + +a2enmod proxy_uwsgi