Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

Synchronous main modification

aapanel.com4b1beb30635e
diff --git a/Dockerfiles/core/Dockerfile b/Dockerfiles/core/Dockerfile
index 761a31a2..0a765d0b 100644
--- a/Dockerfiles/core/Dockerfile
+++ b/Dockerfiles/core/Dockerfile
@@ -1,11 +1,20 @@
FROM alpine:3.20
-LABEL maintainer="https://github.com/aaPanel/Billion-Mail"
+LABEL maintainer="https://github.com/aaPanel/BillionMail"
# Set environment variables
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8
+
+# Platform-specific binary copy
+ARG TARGETARCH
+COPY core/billionmail-${TARGETARCH} /opt/billionmail/core/billionmail
+COPY core/manifest /opt/billionmail/core/manifest
+COPY core/languages /opt/billionmail/core/languages
+COPY core/public /opt/billionmail/core/public
+COPY core/resource /opt/billionmail/core/resource
+
# Copy file
# COPY repositories /etc/apk/repositories
COPY stop-supervisor.sh /stop-supervisor.sh
@@ -26,7 +35,7 @@ RUN apk add --no-cache \
iptables \
ipset \
&& rm -rf /var/cache/apk/* \
- && chmod +x /stop-supervisor.sh /core.sh /restart_fail2ban.sh
+ && chmod +x /stop-supervisor.sh /core.sh /restart_fail2ban.sh /opt/billionmail/core/billionmail
# Copy file
diff --git a/Dockerfiles/core/core.sh b/Dockerfiles/core/core.sh
index 488430cf..db64aabe 100644
--- a/Dockerfiles/core/core.sh
+++ b/Dockerfiles/core/core.sh
@@ -55,11 +55,6 @@ fi
# fi
cp -rf /opt/billionmail/conf/core/fail2ban_init/filter.d/*.conf /etc/fail2ban/filter.d/
-if [ ! -d "/opt/billionmail/core/public/" ]; then
- mkdir -p /opt/billionmail/core/public/dist
- mkdir -p /opt/billionmail/core/public/html
-fi
-
if [ ! -d "/opt/billionmail/core/template/" ]; then
mkdir /opt/billionmail/core/template
fi
@@ -73,14 +68,7 @@ if [ ! -f "/opt/billionmail/core/logs/access-$(date -u +"%Y%m%d").log" ]; then
fi
cd /opt/billionmail/core/
-rm -f billionmail
-echo $(arch)
-if [ ! -f "billionmail-$(arch)" ]; then
- echo "billionmail-$(arch) not found"
- exit 1
-fi
-ln -sf billionmail-$(arch) billionmail
-chmod +x billionmail*
+chmod +x billionmail
exec "$@"
\ No newline at end of file
diff --git a/Dockerfiles/dovecot/Dockerfile b/Dockerfiles/dovecot/Dockerfile
index cc7ff6e2..949cbd18 100644
--- a/Dockerfiles/dovecot/Dockerfile
+++ b/Dockerfiles/dovecot/Dockerfile
@@ -1,6 +1,6 @@
FROM debian:bookworm-slim
-LABEL maintainer="https://github.com/aaPanel/Billion-Mail"
+LABEL maintainer="https://github.com/aaPanel/BillionMail"
ARG DEBIAN_FRONTEND=noninteractive
ENV LC_ALL=C
diff --git a/Dockerfiles/dovecot/dovecot.sh b/Dockerfiles/dovecot/dovecot.sh
index b58c45c3..140400ab 100644
--- a/Dockerfiles/dovecot/dovecot.sh
+++ b/Dockerfiles/dovecot/dovecot.sh
@@ -3,7 +3,9 @@
useradd -r -u 150 -g mail -d /var/vmail -s /sbin/nologin -c "Virtual Mail User" vmail
chown -R vmail:mail /var/vmail
-
+if [ ! -f "/etc/ssl/mail/dh.pem" ] || [ ! -f "/etc/ssl/mail/cert.pem" ] || [ ! -f "/etc/ssl/mail/key.pem" ]; then
+ cp -d -n /etc/ssl/ssl-self-signed/* /etc/ssl/mail/
+fi
cat <<EOF > /etc/dovecot/conf.d/dovecot-sql.conf.ext
driver = pgsql
diff --git a/Dockerfiles/postfix/Dockerfile b/Dockerfiles/postfix/Dockerfile
index 3b37508c..94f025d2 100644
--- a/Dockerfiles/postfix/Dockerfile
+++ b/Dockerfiles/postfix/Dockerfile
@@ -1,6 +1,6 @@
FROM debian:bookworm-slim
-LABEL maintainer="https://github.com/aaPanel/Billion-Mail"
+LABEL maintainer="https://github.com/aaPanel/BillionMail"
ARG DEBIAN_FRONTEND=noninteractive
ENV LC_ALL=C
diff --git a/Dockerfiles/rspamd/Dockerfile b/Dockerfiles/rspamd/Dockerfile
index 7471a95f..c7b27419 100644
--- a/Dockerfiles/rspamd/Dockerfile
+++ b/Dockerfiles/rspamd/Dockerfile
@@ -1,6 +1,6 @@
FROM debian:bookworm-slim
-LABEL maintainer="https://github.com/aaPanel/Billion-Mail"
+LABEL maintainer="https://github.com/aaPanel/BillionMail"
ARG DEBIAN_FRONTEND=noninteractive
ARG RSPAMD_VER=rspamd_3.11.1-1~ab0b44951
diff --git a/conf/webmail/custom.inc.php b/conf/webmail/custom.inc.php
index 080b9581..1ce5aecb 100644
--- a/conf/webmail/custom.inc.php
+++ b/conf/webmail/custom.inc.php
@@ -1,6 +1,6 @@
<?php
# Product name
- $config['product_name'] = 'Billion-Mail';
+ $config['product_name'] = 'BillionMail';
$config['mime_types'] = '/var/roundcube/config/mime.types';
diff --git a/core/go-build.sh b/core/go-build.sh
index 19362bd1..a1da738a 100644
--- a/core/go-build.sh
+++ b/core/go-build.sh
@@ -1,7 +1,7 @@
# !/bin/sh
# How to use:
-# cd /opt/Billion-Mail
+# cd /opt/BillionMail
# docker run -d --name p-g-alpine --hostname p-g-alpine --restart=always -v ./core:/opt/core -v ./Dockerfiles/core/repositories:/etc/apk/repositories alpine:3.20 tail -f /dev/null
# docker exec -it p-g-alpine sh
# cd /opt/core
@@ -51,38 +51,38 @@ fi
if [[ "$PLATFORMS" == "all" || "$PLATFORMS" == "x86" ]]; then
- # amd64 x86_64
- echo "build start amd64 : x86_64"
- rm -f billionmail-x86_64
+ # amd64
+ echo "build start amd64"
+ rm -f billionmail-amd64
export GOOS=linux
export GOARCH=amd64
- go build -ldflags="-s -w" -o billionmail-x86_64 main.go
- if [ ! -f "billionmail-x86_64" ]; then
- echo "build x86_64 failed"
+ go build -ldflags="-s -w" -o billionmail-amd64 main.go
+ if [ ! -f "billionmail-amd64" ]; then
+ echo "build amd64 failed"
exit 1
fi
- check_file=$(file billionmail-x86_64 | grep "x86-64,")
+ check_file=$(file billionmail-amd64 | grep "x86-64,")
if [ -z "${check_file}" ];then
- echo "billionmail-x86_64 is not an arm64 file, package failed.";
+ echo "billionmail-amd64 is not an arm64 file, package failed.";
exit 0;
fi
fi
if [[ "$PLATFORMS" == "all" || "$PLATFORMS" == "arm" ]]; then
- # arm64 aarch64
- echo "build start arm64 : aarch64"
- rm -f billionmail-aarch64
+ # arm64
+ echo "build start arm64"
+ rm -f billionmail-arm64
export GOOS=linux
export GOARCH=arm64
- go build -ldflags="-s -w" -o billionmail-aarch64 main.go
- if [ ! -f "billionmail-aarch64" ]; then
- echo "build aarch64 failed"
+ go build -ldflags="-s -w" -o billionmail-arm64 main.go
+ if [ ! -f "billionmail-arm64" ]; then
+ echo "build arm64 failed"
exit 1
fi
- check_file=$(file billionmail-aarch64 | grep "ARM aarch64,")
+ check_file=$(file billionmail-arm64 | grep -E "ARM|aarch64")
if [ -z "${check_file}" ];then
- echo "billionmail-aarch64 is not an arm64 file, package failed.";
+ echo "billionmail-arm64 is not an arm64 file, package failed.";
exit 0;
fi
fi