move inline to envvariables.sh

This commit is contained in:
Mikhail Timofeev
2020-03-12 23:46:11 +03:00
parent d7c9e5f1d3
commit 09bc20f238
3 changed files with 17 additions and 22 deletions

View File

@@ -0,0 +1,7 @@
#Set ImageVersion and ImageOS env variables
"echo ImageVersion=$IMAGE_VERSION | tee -a /etc/environment",
"echo ImageOS=$IMAGE_OS | 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

View File

@@ -123,18 +123,12 @@
}, },
{ {
"type": "shell", "type": "shell",
"inline": [ "scripts": [
"echo ImageVersion={{user `image_version`}} | tee -a /etc/environment", "{{template_dir}}/scripts/installers/envvariables.sh"
"echo ImageOS={{user `image_os`}} | tee -a /etc/environment"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "environment_vars": [
}, "IMAGE_VERSION={{user `image_version`}}",
{ "IMAGE_OS={{user `image_os`}}"
"type": "shell",
"inline": [
"# 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"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },

View File

@@ -126,18 +126,12 @@
}, },
{ {
"type": "shell", "type": "shell",
"inline": [ "scripts": [
"echo ImageVersion={{user `image_version`}} | tee -a /etc/environment", "{{template_dir}}/scripts/installers/envvariables.sh"
"echo ImageOS={{user `image_os`}} | tee -a /etc/environment"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "environment_vars": [
}, "IMAGE_VERSION={{user `image_version`}}",
{ "IMAGE_OS={{user `image_os`}}"
"type": "shell",
"inline": [
"# 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"
], ],
"execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'" "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
}, },