Merge pull request #432 from linuxserver/code-server-terraform-s6v3

switch to hybrid (code-server-terraform)

README.md

@@ -1,7 +1,7 @@
-# Terraform - Docker mod for code-server
+# Terraform - Docker mod for code-server/openvscode-server
 
-This mod adds the Terraform binary and extension to code-server, to be installed/updated during container start.
+This mod adds the Terraform binary and extension to code-server/openvscode-server, to be installed/updated during container start.
 
-In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-terraform`
+In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-terraform`
 
 If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-terraform|linuxserver/mods:code-server-zsh`

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/run

@@ -0,0 +1,15 @@
+#!/usr/bin/with-contenv bash
+
+if ! dpkg -l | grep gnupg > /dev/null; then
+    apt-get update && apt-get install -y gnupg
+fi
+
+if [ ! -f "/etc/apt/sources.list.d/hashicorp.list" ]; then
+    echo "**** Adding terraform packages to install list ****"
+    curl -s https://apt.releases.hashicorp.com/gpg | apt-key add -
+    source /etc/lsb-release
+    echo "deb https://apt.releases.hashicorp.com ${DISTRIB_CODENAME} main" > /etc/apt/sources.list.d/hashicorp.list
+    echo "terraform" >> /mod-repo-packages-to-install.list
+else
+    echo "**** Terraform packages already installed, skipping ****"
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/run

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/run

@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+install-extension hashicorp.terraform

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/run