Refactor: Conditional rootfs copy and S6 setup improvements

Author: ptbsare

Dockerfile

@@ -52,16 +52,13 @@ RUN if echo "$BUILD_FROM" | grep -q "home-assistant"; then \
     mkdir -p /tmp/uv_test && uv venv /tmp/uv_test && rm -rf /tmp/uv_test && \
     # Install specific Node.js version for addon
     echo "Installing Node.js v${NODE_VERSION} for addon..." && \
-    curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
-    #apt-get update && \
-    #sudo apt-get install -y nodejs npm \
-    # Install S6-Overlay for addon service management
-    echo "Installing S6-Overlay for addon..." && \
-    S6_OVERLAY_VERSION=$(curl -sL "https://api.github.com/repos/just-containers/s6-overlay/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') && \
-    echo "Latest S6-Overlay version: $S6_OVERLAY_VERSION" && \
-    curl -o /usr/local/bin/s6-overlay-installer.sh -L "https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-installer.sh" && \
-    chmod +x /usr/local/bin/s6-overlay-installer.sh && \
-    /usr/local/bin/s6-overlay-installer.sh / && \
+    #curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && \
+    # Ensure Node.js and npm are installed if using this path.
+    # The line below was `sudo apt-get install -y nodejs npm`.
+    # `sudo` is generally not available or needed in Dockerfiles.
+    # Also, `apt-get update` should precede `apt-get install`.
+    apt-get update && apt-get install -y nodejs npm && \
+    # S6-Overlay is assumed to be part of the Home Assistant base image.
     # Cleanup for addon OS setup
     echo "Cleaning up apt cache for addon OS setup..." && \
     apt-get clean && \
@@ -96,8 +93,24 @@ RUN if [ -n "$PRE_INSTALLED_INIT_COMMAND_ARG" ]; then \
 #COPY package.json package-lock.json* ./
 #COPY tsconfig.json ./
 #COPY public ./public
+# COPY . . should come before conditional rootfs copy if rootfs might overlay app files,
+# or after if app files might overlay rootfs defaults.
+# Assuming app files are primary, then addon specifics overlay.
 COPY . .
 
+# --- Addon Specific: Copy rootfs for S6-Overlay and other addon specific files ---
+RUN if echo "$BUILD_FROM" | grep -q "home-assistant"; then \
+    echo "Addon build: Copying rootfs contents..." && \
+    # Ensure rootfs directory exists in the build context
+    if [ -d "rootfs" ]; then \
+      cp -r rootfs/. / ; \
+    else \
+      echo "Warning: rootfs directory not found, skipping copy."; \
+    fi; \
+  else \
+    echo "Standalone build: Skipping rootfs copy."; \
+  fi
+
 RUN npm install
 RUN npm run build
 
@@ -124,17 +137,6 @@ VOLUME /mcp-proxy-server/config
   # For external tools referenced in config, and default install location if TOOLS_FOLDER is /tools
 VOLUME /tools
 
-RUN if echo "$BUILD_FROM" | grep -q "home-assistant"; then \
-echo "Addon build: Making S6 run script executable..." && \
-mkdir -p /etc/cont-init.d/ && \
-cp run.sh /etc/cont-init.d/99-run-mcp-proxy && \
-chmod +x /etc/cont-init.d/99-run-mcp-proxy; \
-else \
-echo "Standalone build: S6 run script not made executable (or should be removed if not needed)."; \
-# For a pure standalone build without S6, this file might be removed:
-# rm -f /etc/cont-init.d/99-run-mcp-proxy; \
-fi
-
 # --- Expose Port ---
 EXPOSE 3663