refactor(ci): changes Dockerfile and entrypoint

Author: pedrobrantes

nix_test_env/Dockerfile

@@ -20,33 +20,31 @@ RUN mkdir -m 0755 /nix \
 # Set environment so Nix is on PATH
 ENV USER=root
 ENV HOME=/root
-ENV PATH=/root/.nix-profile/bin:/root/.nix-profile/sbin:$PATH
-
-# Install Nix
-RUN curl -L https://nixos.org/nix/install | sh -s -- --daemon
 
 # Configure Nix to run in unprivileged mode (no nixbld group needed)
 RUN mkdir -p /etc/nix && echo "build-users-group =" >> /etc/nix/nix.conf
 
+# Install Nix
+RUN curl -L https://nixos.org/nix/install | sh -s -- --no-daemon --no-modify-profile --no-channel-add --yes
+
+# Set PATH after Nix installation to include Nix binaries explicitly
+ENV PATH="/root/.nix-profile/bin:/root/.nix-profile/sbin:${PATH}"
+
 # Add Nix channels for Nixpkgs and Home Manager
 # Source the Nix profile before running nix-channel commands
-RUN . /root/.nix-profile/etc/profile.d/nix.sh && \
-    nix-channel --add https://nixos.org/channels/nixos-25.05 nixpkgs && \
-    nix-channel --add https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz home-manager && \
-    nix-channel --update
+RUN . /root/.nix-profile/etc/profile.d/nix.sh
+RUN nix-channel --add https://nixos.org/channels/nixos-25.05 nixpkgs
+RUN nix-channel --add https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz home-manager
+RUN nix-channel --update
 
-# Install home-manager for the root user
-RUN . /root/.nix-profile/etc/profile.d/nix.sh && \
-    nix-shell '<home-manager>' -A install
+# Install home-manager
+RUN nix-env -iA home-manager -f '<home-manager>'
 
-# Nix bin path for any shells
-RUN echo 'export PATH="/root/.nix-profile/bin:$PATH"' \
-    > /etc/profile.d/hm-path.sh
+# Copy into the container
+WORKDIR /root/.config/home-manager
+COPY . .
 
-# Entrypoint
-COPY nix_test_env/docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
-RUN chmod +x /usr/local/bin/docker_entrypoint.sh
+RUN chmod +x ./nix_test_env/docker_entrypoint.sh
+ENTRYPOINT ["./nix_test_env/docker_entrypoint.sh"]
 
-WORKDIR /root
-ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"]
 CMD ["tail", "-f", "/dev/null"]

nix_test_env/docker_entrypoint.sh

@@ -1,19 +1,40 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+# FIX: Initialize the variable before it's used to satisfy `set -u`
 export __HM_SESS_VARS_SOURCED="${__HM_SESS_VARS_SOURCED:-0}"
 
-source /root/.nix-profile/etc/profile.d/nix.sh
+# Source the Nix profile script to ensure PATH is set correctly
+# Check if the profile script exists before sourcing
+if [ -f "/root/.nix-profile/etc/profile.d/nix.sh" ]; then
+  echo "Sourcing /root/.nix-profile/etc/profile.d/nix.sh"
+  source /root/.nix-profile/etc/profile.d/nix.sh
+else
+  echo "Warning: /root/.nix-profile/etc/profile.d/nix.sh not found. Nix environment may not be fully set up."
+fi
 
-if command -v home-manager &>/dev/null; then
-  home-manager switch || echo "home-manager switch fail"
+# Source hm-session-vars.sh if it exists (for home-manager)
+if [ -f "/root/.nix-profile/etc/profile.d/hm-session-vars.sh" ]; then
+  echo "Sourcing /root/.nix-profile/etc/profile.d/hm-session-vars.sh"
+  source /root/.nix-profile/etc/profile.d/hm-session-vars.sh
+else
+  echo "Warning: /root/.nix-profile/etc/profile.d/hm-session-vars.sh not found. Home-manager variables may not be set."
 fi
 
-source /root/.nix-profile/etc/profile.d/hm-session-vars.sh
+# Ensure Nix binaries are in PATH for subsequent commands
+export PATH="/root/.nix-profile/bin:/root/.nix-profile/sbin:${PATH}"
 
-export PATH="/root/.nix-profile/bin:$PATH"
+# Run home-manager switch if home-manager is available
+if command -v home-manager &>/dev/null; then
+  echo "Running home-manager switch..."
+  home-manager switch || echo "home-manager switch failed."
+else
+  echo "Warning: home-manager not found. Skipping home-manager switch."
+fi
 
+# If no arguments are provided, keep the container running
 if [[ $# -eq 0 ]]; then
+  echo "No command provided, keeping container alive..."
   set -- tail -f /dev/null
 fi