instance-scripts/cloud-init.yml

@@ -9,6 +9,7 @@ packages:
   - curl
   - git
   - argon2
+  - build-essential
 
 runcmd:
 #
@@ -17,30 +18,30 @@ runcmd:
   - "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"
-#
 # Install Docker
 #
-  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/docker.sh | bash"
+  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/docker.sh | bash"
 #
 # Install Atrium
 #
-  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/atrium.sh | bash"
+  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/atrium.sh | bash"
 #
 # Install 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/main/instance-scripts/scripts/code-server.sh | bash"
 #
 # Install Webtop
 #
-  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/webtop.sh | sh"
+  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/webtop.sh | sh"
 #
 # Install ttyd
 #
-  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/scripts/ttyd.sh | bash"
+  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/ttyd.sh | bash"
+#
+# Install Rust
+#
+  - "curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/scripts/rust.sh | bash"
 #
 # Install Repository
 #
-  - "git clone https://github.com/NathanRodet/rust-axum-demo /root/rust-axum-demo"
+  - "git clone https://github.com/NathanRodet/rust-axum-demo /root/rust-axum-demo"
\ No newline at end of file

instance-scripts/config-files/atrium.yaml

@@ -9,29 +9,36 @@ apps: # optional : applications served by atrium
     icon: web_asset
     color: 4292030255
     is_proxy: true
-    host: code-%atrium_count_index%
+    host: code
     target: localhost:8080
   - id: 2
     name: Desktop
     icon: web_asset
     color: 4292030255
     is_proxy: true
-    host: desktop-%atrium_count_index%
+    host: desktop
     target: localhost:8081
   - id: 3
     name: Terminal
     icon: terminal
     color: 4292030255
     is_proxy: true
-    host: terminal-%atrium_count_index%
+    host: terminal
     target: localhost:8082
     secured: true
     login: admin
     password: %user_password%
     roles:
       - ADMINS
+  - id: 4
+    name: App
+    icon: web_asset
+    color: 4292030255
+    is_proxy: true
+    host: app
+    target: localhost:3000
 users:
   - login: admin
     password: %user_password_hash%
     roles:
-      - ADMINS
+      - ADMINS
\ No newline at end of file

instance-scripts/config-files/config.yaml

@@ -2,4 +2,4 @@
 bind-addr: 0.0.0.0:8080
 auth: password
 password: %user_password%
-cert: false
+cert: false
\ No newline at end of file

instance-scripts/scripts/atrium.sh

@@ -12,7 +12,7 @@
 export USER_PASSWORD_HASH=$(echo -n "$(scw-userdata user_password)" | argon2 "$(echo $RANDOM | md5sum | head -c 12)" -id -l 32 -e)
 
 mkdir -p /root/atrium/data && mkdir -p /root/atrium/letsencrypt_cache
-curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/atrium.yaml -o root/atrium/atrium.yaml
+curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/config-files/atrium.yaml?inline=false -o root/atrium/atrium.yaml
 
 sed -i "s|%atrium_hostname%|$(scw-userdata atrium_hostname)|g" /root/atrium/atrium.yaml
 sed -i "s|%project_domain%|$(scw-userdata project_domain)|g" /root/atrium/atrium.yaml

instance-scripts/scripts/code-server.sh

@@ -5,7 +5,7 @@
 #
 
 mkdir -p  /root/.config/code-server/
-curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/config.yaml -o root/.config/code-server/config.yaml
+curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/config-files/config.yaml -o root/.config/code-server/config.yaml
 sed -i "s/%user_password%/$(scw-userdata user_password)/g" /root/.config/code-server/config.yaml
 curl -fsSL https://code-server.dev/install.sh | sh
 

instance-scripts/scripts/rust.sh

@@ -4,5 +4,6 @@
 # Install Rust
 #
 
+export HOME=/root
 curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-source "$HOME/.cargo/env"
+source "$HOME/.cargo/env"
\ No newline at end of file

instance-scripts/scripts/ttyd.sh

@@ -7,7 +7,7 @@
 mkdir -p /root/ttyd
 curl -k -L -s https://github.com/tsl0922/ttyd/releases/download/1.7.3/ttyd.x86_64 -o root/ttyd/ttyd.x86_64
 chmod +x /root/ttyd/ttyd.x86_64
-curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/develop/instance-scripts/config-files/ttyd.service -o etc/systemd/system/ttyd.service
+curl https://forge.grandlyon.com/systemes-dinformation/alpha/projects/labo-rust/-/raw/main/instance-scripts/config-files/ttyd.service -o etc/systemd/system/ttyd.service
 sed -i "s|%user_password%|$(scw-userdata user_password)|g" /etc/systemd/system/ttyd.service
 
 systemctl enable ttyd.service && systemctl start ttyd.service