Add path via etc profiles

Author: sdankel

.devcontainer.json

@@ -21,9 +21,6 @@
         "ghcr.io/devcontainers/features/common-utils:1": {},
         "ghcr.io/devcontainers/features/docker-in-docker:2": {}
     },
-    "remoteEnv": { 
-        "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
-    },
     "remoteUser": "node",
     "postCreateCommand": "npm install -g @devcontainers/cli"
 }

README.md

@@ -18,16 +18,11 @@ Running `fuelup` inside the built container will install `fuelup` and the specif
 - beta-3
 - nightly
 
-For convience, it's recommended to add the .fuelup directory to the remote user's path in the config:
-
 ```jsonc
 {
     "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
     "features": {
         "ghcr.io/FuelLabs/devcontainer-features/fuelup:1": {}
-    },
-    "remoteEnv": { 
-        "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
     }
 }
 ```
@@ -41,9 +36,6 @@ is equivalent to:
         "ghcr.io/FuelLabs/devcontainer-features/fuelup:1": {
             "toolchain": "latest"
         }
-    },
-    "remoteEnv": { 
-        "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
     }
 }
 ```

src/fuelup/install.sh

@@ -1,9 +1,19 @@
 #!/bin/sh
-set -x
+set -e
 
 echo "Installing fuelup with provided toolchain: ${TOOLCHAIN}"
 
 export DEBIAN_FRONTEND=noninteractive
+export PATH=$HOME/.fuelup/bin:$PATH
+
+if [ "$(id -u)" -ne 0 ]; then
+    echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
+    exit 1
+fi
+
+# Add fuelup the the path for all new login shells.
+echo "export PATH=\$PATH:\$HOME/.fuelup/bin" > /etc/profile.d/00-fuelup.sh
+chmod +x /etc/profile.d/00-fuelup.sh
 
 # Updates apt-get if the cache is empty.
 apt_get_update()
@@ -28,22 +38,18 @@ check_packages curl git-all sudo
 # Install fuelup.
 curl --proto '=https' --tlsv1.2 -sSf https://install.fuel.network/fuelup-init.sh | sh -s -- --no-modify-path
 
-printenv
-
-# If the remote user is a different user, copy the fuelup directory to the remote user's home.
-if [ "$HOME" != "$_REMOTE_USER_HOME" ]; then
-    sudo cp -r $HOME/.fuelup $_REMOTE_USER_HOME/.fuelup
-fi
-
-export PATH=$HOME/.fuelup/bin:$PATH
-
 # The latest toolchain is installed by default. If a specific toolchain is requested, install it and
 # set it as the default.
 if [ "${TOOLCHAIN}" != "latest" ]; then
     fuelup toolchain install ${TOOLCHAIN}
     fuelup default ${TOOLCHAIN}
 fi
 
+# If the remote user is a different user, copy the fuelup directory to the remote user's home.
+if [ "$HOME" != "$_REMOTE_USER_HOME" ]; then
+    sudo cp -r $HOME/.fuelup $_REMOTE_USER_HOME/.fuelup
+fi
+
 # Ensure fuelup and forc are installed.
 fuelup --version
 forc --version

test/fuelup/scenarios.json

@@ -4,9 +4,6 @@
         "features": {
             "ghcr.io/devcontainers/features/common-utils:1": {},
             "fuelup": {}
-        },
-        "remoteEnv": { 
-            "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
         }
     },
     "root": {
@@ -15,9 +12,6 @@
             "ghcr.io/devcontainers/features/common-utils:1": {},
             "fuelup": {}
         },
-        "remoteEnv": { 
-            "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
-        },
         "remoteUser": "root"
     },
     "vscode": {
@@ -26,9 +20,6 @@
             "ghcr.io/devcontainers/features/common-utils:1": {},
             "fuelup": {}
         },
-        "remoteEnv": { 
-            "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
-        },
         "remoteUser": "vscode"
     },
     "nightly": {
@@ -38,9 +29,6 @@
             "fuelup": {
                 "toolchain": "nightly"
             }
-        },
-        "remoteEnv": { 
-            "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
         }
     },
     "latest": {
@@ -50,9 +38,6 @@
             "fuelup": {
                 "toolchain": "latest"
             }
-        },
-        "remoteEnv": { 
-            "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
         }
     },
     "beta-1": {
@@ -62,9 +47,6 @@
             "fuelup": {
                 "toolchain": "beta-1"
             }
-        },
-        "remoteEnv": { 
-            "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
         }
     },
     "beta-2": {
@@ -74,9 +56,6 @@
             "fuelup": {
                 "toolchain": "beta-2"
             }
-        },
-        "remoteEnv": { 
-            "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
         }
     },
     "beta-3": {
@@ -86,9 +65,6 @@
             "fuelup": {
                 "toolchain": "beta-3"
             }
-        },
-        "remoteEnv": { 
-            "PATH": "${containerEnv:PATH}:~/.fuelup/bin"
         }
     }
 }

test/fuelup/test.sh

@@ -24,10 +24,6 @@ set -e
 # Provides the 'check' and 'reportResults' commands.
 source dev-container-features-test-lib
 
-# Add the fuelup bin directory to the PATH, since this is not being done in the default
-# devcontainer.json.
-export PATH=$HOME/.fuelup/bin:$PATH
-
 # Feature-specific tests
 # The 'check' command comes from the dev-container-features-test-lib.
 check "execute command" fuelup --version | grep 'fuelup'