From 269ab22de827d8c57e3d274ce28aee974ce551fa Mon Sep 17 00:00:00 2001 From: Nathan Rodet <nrodet@grandlyon.com> Date: Fri, 13 Jan 2023 11:35:40 +0100 Subject: [PATCH] Working scripts configuration --- instance-scripts/cloud-init.yml | 9 +++++++-- instance-scripts/scripts/code-server.sh | 4 ---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/instance-scripts/cloud-init.yml b/instance-scripts/cloud-init.yml index f4fdcaa..42b0cdf 100644 --- a/instance-scripts/cloud-init.yml +++ b/instance-scripts/cloud-init.yml @@ -11,6 +11,11 @@ packages: runcmd: # +# cloud-init execute cmd before HOME and USER are set. +# + - "export HOME=/root" + - "export USER=root" +# # Install Rust # - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/rust.sh | bash" @@ -21,13 +26,13 @@ runcmd: # # Install Atrium # - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/atrium.yaml -o atrium.yaml" + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/atrium.yaml -o root/atrium.yaml" - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/atrium.sh | bash" # # Install And Run Code Server # - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/code-server.sh | bash" - - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/config.yaml -o config.yaml" + - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/config.yaml -o root/config.yaml" # # Run Webtop Container # diff --git a/instance-scripts/scripts/code-server.sh b/instance-scripts/scripts/code-server.sh index 3934c62..7b0ee1c 100644 --- a/instance-scripts/scripts/code-server.sh +++ b/instance-scripts/scripts/code-server.sh @@ -4,10 +4,6 @@ # Install Code Server # -# cloud-init execute the bash script before HOME and USER are set. -export HOME=/root -export USER=root - mkdir -p /root/.config/code-server/ sed -i "s/%user_password%/$(scw-userdata user_password)/g" /root/config.yaml mv /root/config.yaml /root/.config/code-server/config.yaml -- GitLab