Fix HAOS compatibility and update documentation

2026-04-04 00:37:10 +02:00
parent b23d0b4072
commit c4ddb25467
12 changed files with 293 additions and 111 deletions
--- a/108
+++ b/108
@@ -1,48 +1,60 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-ubuntu:noble
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG FOLDINGATHOME_RELEASE
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca"
-
-#Add needed nvidia environment variables for container toolkit
-ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
-
-# global environment settings
-ENV DEBIAN_FRONTEND="noninteractive"
-
-RUN \
-  echo "**** install runtime packages ****" && \
-  apt-get update && \
-  apt-get install -y \
-    bzip2 \
-    intel-opencl-icd \
-    libexpat1 && \
-  ln -s libOpenCL.so.1 /usr/lib/x86_64-linux-gnu/libOpenCL.so && \
-  echo "**** install foldingathome ****" && \
-  download_url="https://download.foldingathome.org/releases/public/fah-client/"$(curl -s https://download.foldingathome.org/releases/public/fah-client/meta.json | jq -r '.[] | select((.package | contains("debian")) and (.package | contains("release"))) | .package' | grep -v "arm64" | grep "tar.bz2") && \
-  curl -o \
-    /tmp/fah.tar.bz2 -L \
-    ${download_url} && \
-  tar xf /tmp/fah.tar.bz2 -C /app --strip-components=1 && \
-  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
-  echo "**** cleanup ****" && \
-  apt-get clean && \
-  rm -rf \
-    /tmp/* \
-    /var/lib/apt/lists/* \
-    /var/tmp/* \
-    /var/log/*
-
-# add local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 7396
-
-VOLUME /config
-CMD ["/usr/bin/fahclient", "--config", "/config/config.xml", "${CLI_ARGS}"]
+# syntax=docker/dockerfile:1
+
+ARG BUILD_FROM
+FROM $BUILD_FROM
+
+ARG BUILD_DATE
+ARG BUILD_REF
+ARG BUILD_VERSION
+ARG BUILD_ARCH
+
+LABEL \
+    io.hass.name="Folding@home" \
+    io.hass.description="Run Folding@home to contribute to scientific research" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.type="addon" \
+    io.hass.version=${BUILD_VERSION} \
+    maintainer="retr0"
+
+# Add needed NVIDIA environment variables for container toolkit
+ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
+
+# Prevent interactive prompts during package installation
+ENV DEBIAN_FRONTEND="noninteractive"
+
+RUN \
+    echo "**** install runtime packages ****" && \
+    apt-get update && \
+    apt-get install -y --no-install-recommends \
+        bzip2 \
+        curl \
+        jq \
+        libexpat1 \
+        netcat-openbsd && \
+    echo "**** install foldingathome ****" && \
+    if [ "${BUILD_ARCH}" = "aarch64" ]; then \
+        ARCH_PATTERN="arm64"; \
+    else \
+        ARCH_PATTERN="x86_64"; \
+    fi && \
+    DOWNLOAD_PATH=$(curl -fsSL "https://download.foldingathome.org/releases/public/fah-client/meta.json" | \
+        jq -r --arg arch "${ARCH_PATTERN}" \
+        '.[] | select((.package | contains("linux")) and (.package | contains("release")) and (.package | contains($arch)) and (.package | endswith(".tar.bz2"))) | .package' \
+        | head -1) && \
+    echo "Downloading FAH client: ${DOWNLOAD_PATH}" && \
+    curl -fsSL "https://download.foldingathome.org/releases/public/fah-client/${DOWNLOAD_PATH}" \
+        -o /tmp/fah.tar.bz2 && \
+    mkdir -p /app && \
+    tar xf /tmp/fah.tar.bz2 -C /app --strip-components=1 && \
+    echo "**** cleanup ****" && \
+    apt-get clean && \
+    rm -rf \
+        /tmp/* \
+        /var/lib/apt/lists/* \
+        /var/tmp/* \
+        /var/log/*
+
+# Add local files
+COPY root/ /
+
+EXPOSE 7396