Build from source to guarantee AFP mount tools are shipped with the image

Author: alsotoes

afp2s3/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.5
+
+- Build `afpfs-ng` from source to guarantee AFP mount tools are shipped with the image.
+
 ## 0.1.4
 
 - Validate AFP mounts by requiring the `.com.apple.timemachine.supported` marker file from the remote share.

afp2s3/Dockerfile

@@ -1,14 +1,57 @@
 ARG BUILD_FROM
+ARG AFPFS_VERSION=0.8.1
+
+FROM ${BUILD_FROM} AS afpfs_build
+
+ARG AFPFS_VERSION
+
+# Build afpfs-ng from source so the AFP tools are available on all architectures
+RUN apk add --no-cache \
+    autoconf \
+    automake \
+    bash \
+    build-base \
+    ca-certificates \
+    fuse-dev \
+    fuse3-dev \
+    glib-dev \
+    libgcrypt-dev \
+    libgpg-error-dev \
+    libtool \
+    linux-headers \
+    openssl-dev \
+    pkgconfig \
+    tar \
+    wget
+
+WORKDIR /tmp
+
+RUN wget -O afpfs-ng.tar.gz https://github.com/afpfs-ng/afpfs-ng/releases/download/v${AFPFS_VERSION}/afpfs-ng-${AFPFS_VERSION}.tar.gz \
+    && tar -xzf afpfs-ng.tar.gz \
+    && cd afpfs-ng-${AFPFS_VERSION} \
+    && if ! ./configure --prefix=/usr --sysconfdir=/etc --disable-python; then \
+        ./configure --prefix=/usr --sysconfdir=/etc; \
+    fi \
+    && make -j"$(getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)" \
+    && make install DESTDIR=/tmp/afpfs-install
+
 FROM ${BUILD_FROM}
 
-# Install dependencies
+# Install runtime dependencies, including libraries required by afpfs-ng
 RUN apk add --no-cache \
+    ca-certificates \
+    fuse \
     fuse3 \
-    afpfs-ng \
+    glib \
+    libgcrypt \
+    libgpg-error \
+    openssl \
     util-linux \
     jq \
     wget
 
+COPY --from=afpfs_build /tmp/afpfs-install/ /
+
 # Copy data for add-on
 COPY rootfs /
 RUN chmod a+x /run.sh

afp2s3/README.md

@@ -1,4 +1,4 @@
-![afp2s3 Logo](https://raw.githubusercontent.com/hassio-infrastructure/afp2s3/main/logo.png)
+![afp2s3 Logo](logo.png)
 
 # Home Assistant Add-on: afp2s3
 

afp2s3/config.yaml

@@ -1,6 +1,6 @@
 ---
 name: AFP to S3
-version: "0.1.4"
+version: "0.1.5"
 slug: afp2s3
 description: Mounts an AFP share and exposes it as an S3 endpoint using Minio.
 url: https://github.com/alsotoes/hassio-infrastructure/tree/main/afp2s3