actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-14 05:07:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Ubuntu] Add a file with global user-related variables and point BASH_ENV variable to it (#2826)

Browse Source 
* Add global vars to profile.d

* set BASH_ENV var

* fix comment

* remove extra quotes
This commit is contained in:
Mikhail Timofeev
2021-03-03 17:45:01 +03:00
committed by GitHub
parent ff72158a2a
commit e7e66bec69
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
images/linux/scripts/installers/configure-environment.sh
View File

@@ -4,9 +4,14 @@
echo ImageVersion=$IMAGE_VERSION | tee -a /etc/environment
echo ImageOS=$IMAGE_OS | tee -a /etc/environment
# Create a file to store user-related global environment variables
touch /etc/profile.d/env_vars.sh
# Set BASH_ENV variable pointed to the file with user-related global environment variables for non-interactive sessions
echo "BASH_ENV=/etc/profile.d/env_vars.sh" | tee -a /etc/environment
# This directory is supposed to be created in $HOME and owned by user(https://github.com/actions/virtual-environments/issues/491)
mkdir -p /etc/skel/.config/configstore
echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/skel/.bashrc
echo 'export XDG_CONFIG_HOME=$HOME/.config' | tee -a /etc/profile.d/env_vars.sh
# Change waagent entries to use /mnt for swapfile
sed -i 's/ResourceDisk.Format=n/ResourceDisk.Format=y/g' /etc/waagent.conf

3
images/linux/scripts/installers/dotnetcore-sdk.sh
View File

@@ -89,7 +89,6 @@ done
setEtcEnvironmentVariable DOTNET_SKIP_FIRST_TIME_EXPERIENCE 1
setEtcEnvironmentVariable DOTNET_NOLOGO 1
setEtcEnvironmentVariable DOTNET_MULTILEVEL_LOOKUP 0
prependEtcEnvironmentPath /home/runner/.dotnet/tools
echo 'export PATH="$PATH:$HOME/.dotnet/tools"' | tee -a /etc/skel/.bashrc
echo 'export PATH=$PATH:$HOME/.dotnet/tools' | tee -a /etc/profile.d/env_vars.sh
invoke_tests "DotnetSDK"

2
images/linux/scripts/installers/nvm.sh
View File

@@ -8,7 +8,7 @@ export NVM_DIR="/etc/skel/.nvm"
mkdir $NVM_DIR
VERSION=$(curl -s https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name')
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/$VERSION/install.sh | bash
echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/skel/.bash_profile
echo 'export NVM_DIR=$HOME/.nvm' | tee -a /etc/profile.d/env_vars.sh
echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm' | tee -a /etc/skel/.bash_profile
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

5
images/linux/scripts/installers/php.sh
View File

@@ -88,11 +88,8 @@ php composer-setup.php
sudo mv composer.phar /usr/bin/composer
php -r "unlink('composer-setup.php');"
# Update /etc/environment
prependEtcEnvironmentPath /home/runner/.config/composer/vendor/bin
# Add composer bin folder to path
echo 'export PATH="$PATH:$HOME/.config/composer/vendor/bin"' >> /etc/skel/.bashrc
echo 'export PATH=$PATH:$HOME/.config/composer/vendor/bin' | tee -a /etc/profile.d/env_vars.sh
#Create composer folder for user to preserve folder permissions
mkdir -p /etc/skel/.composer

2
images/linux/scripts/installers/python.sh
View File

@@ -41,6 +41,6 @@ if isUbuntu18 || isUbuntu20 ; then
fi
# Adding this dir to PATH will make installed pip commands are immediately available.
echo 'export PATH="$PATH:$HOME/.local/bin"' | tee -a /etc/skel/.bashrc
echo 'export PATH=$PATH:$HOME/.local/bin' | tee -a /etc/profile.d/env_vars.sh
invoke_tests "Tools" "Python"