fix(redis): proper pathing for Rust binaries

Author: Greelan

apps/redis/Dockerfile

@@ -7,7 +7,6 @@ LABEL       org.opencontainers.image.licenses=MIT
 
 ENV         CARGO_HOME="/usr/local/cargo"
 ENV         RUSTUP_HOME="/usr/local/rustup"
-ENV         AMP_ADDITIONAL_ENV_VARS="CARGO_HOME RUSTUP_HOME"
 ENV         DEBIAN_FRONTEND="noninteractive"
 
 # Install dependencies as per official Redis build instructions, and Rust for building modules
@@ -16,7 +15,12 @@ RUN         set -eux; \
             apt-get install -o APT::Keep-Downloaded-Packages="false" -y --no-install-recommends \
                 ca-certificates wget dpkg-dev gcc g++ libc6-dev libssl-dev make git cmake python3 \
                 python3-pip python3-venv python3-dev unzip rsync clang automake autoconf libtool pkg-config; \
-            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal --default-toolchain stable; \
+            curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
+            | sh -s -- -y --no-modify-path --profile minimal --default-toolchain stable; \
+            /usr/local/cargo/bin/rustup default stable; \
+            TOOLCHAIN="$(/usr/local/cargo/bin/rustup show active-toolchain | awk '{print $1}')"; \
+            ln -s "/usr/local/rustup/toolchains/${TOOLCHAIN}/bin" /opt/rust-bin; \
+            rm -f /usr/local/cargo/bin/cargo /usr/local/cargo/bin/rustc /usr/local/cargo/bin/rustdoc; \
             apt-get clean; \
             rm -rf /var/lib/apt/lists/*
 

scripts/apps/redis/ampstart.sh

@@ -91,17 +91,23 @@ fi
 XDG_RUNTIME_DIR="/run/user/${AMPUSERID}"
 install -d -m 0700 -o amp -g amp "${XDG_RUNTIME_DIR}"
 
+# Addition for Redis (for Rust)
+# PATH is also modified
+CARGO_HOME="/home/amp/.cargo"
+install -d -m 0755 -o amp -g amp "${CARGO_HOME}"
+
 # Handoff
 echo "[Info] Starting AMP..."
 ARGS=$@
-# Use specific PATH for Redis to include Rust cargo bin
+# Use specific PATH for Redis to include Rust toolchain binaries, and add CARGO_HOME
 keep_env=(
   HOME=/home/amp
   USER=amp LOGNAME=amp SHELL=/bin/bash
   LANG="${LANG:-en_US.UTF-8}" LANGUAGE="${LANGUAGE:-en_US:en}" LC_ALL="${LC_ALL:-en_US.UTF-8}"
-  PATH=/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
+  PATH=/opt/rust-bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
   MAIL=/var/mail/amp
   XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}"
+  CARGO_HOME="${CARGO_HOME}"
 )
 # Always keep these AMP_ env vars if set
 for v in AMPHOSTPLATFORM AMP_CONTAINER AMP_CONTAINER_HOST_NETWORK AMPMEMORYLIMIT AMPSWAPLIMIT AMPCONTAINERCPUS; do