Multi-arch container build

Author: technicalguru

Dockerfile

@@ -41,11 +41,8 @@ RUN apt-get install -y --no-install-recommends \
     spamc
 
 # Amavis-new
-ENV AV_VERSION="1:2.13"
-ENV AV_REVISION="0"
-ENV AV_PACKAGE="1:2.13.0-3+deb12u1"
 RUN apt-get install -y --no-install-recommends \
-    amavisd-new=${AV_PACKAGE} \
+    amavisd-new \
     && rm -rf /var/lib/apt/lists/*
 
 # Create initial AV data
@@ -91,8 +88,6 @@ RUN chmod 777 /var/log
 ARG ARG_CREATED
 ARG ARG_URL=https://github.com/technicalguru/docker-mailserver-amavis
 ARG ARG_SOURCE=https://github.com/technicalguru/docker-mailserver-amavis
-ARG ARG_VERSION="${AV_VERSION}.${AV_REVISION}"
-ARG ARG_REVISION="${AV_REVISION}"
 ARG ARG_VENDOR=technicalguru
 ARG ARG_TITLE=technicalguru/mailserver-amavis
 ARG ARG_DESCRIPTION="Provides Amavis mail scanner with ClamAV and SpamAssassin"
@@ -103,8 +98,6 @@ ARG ARG_LICENSES=GPL-3.0-or-later
 LABEL org.opencontainers.image.created=$ARG_CREATED
 LABEL org.opencontainers.image.url=$ARG_URL
 LABEL org.opencontainers.image.source=$ARG_SOURCE
-LABEL org.opencontainers.image.version=$ARG_VERSION
-LABEL org.opencontainers.image.revision=$ARG_REVISION
 LABEL org.opencontainers.image.vendor=$ARG_VENDOR
 LABEL org.opencontainers.image.title=$ARG_TITLE
 LABEL org.opencontainers.image.description=$ARG_DESCRIPTION
@@ -122,3 +115,5 @@ WORKDIR /usr/local/amavis
 CMD ["/usr/local/amavis/entrypoint.sh"]
 #CMD ["/usr/local/amavis/loop.sh"]
 
+RUN echo "Amavis version: $(amavisd -V)"
+

README.md

@@ -15,7 +15,11 @@ Related images:
 # Tags
 The following versions are available from DockerHub. The image tag matches the Amavisd-new version.
 
-* [2.13.0.3, 2.13.0, 2.13, 2, latest](https://hub.docker.com/repository/docker/technicalguru/mailserver-amavis/tree/v2.13.0.3) - [Dockerfile](https://github.com/technicalguru/docker-mailserver-amavis/blob/2.13.0.3/Dockerfile)
+* [2.13.0.4, 2.13.0, 2.13, 2, latest](https://hub.docker.com/repository/docker/technicalguru/mailserver-amavis/tree/v2.13.0.4) - [Dockerfile](https://github.com/technicalguru/docker-mailserver-amavis/blob/2.13.0.3/Dockerfile)
+
+# Supported Platforms
+* linux/amd64
+* linux/arm64
 
 # Features
 * [Amavis Checker](https://www.amavis.org/) v2.13.0

build.sh

@@ -1 +1,11 @@
-docker build --progress=plain -t technicalguru/mailserver-amavis:latest .
+docker buildx build \
+     --progress=plain \
+     -t technicalguru/mailserver-amavis:latest \
+     -t technicalguru/mailserver-amavis:2.13.0.3 \
+     -t technicalguru/mailserver-amavis:2.13.0 \
+     -t technicalguru/mailserver-amavis:2.13 \
+     -t technicalguru/mailserver-amavis:2 \
+     --push \
+     --platform linux/amd64,linux/arm64 \
+
+#docker build --progress=plain -t technicalguru/mailserver-amavis:latest .